diff --git a/Microsoft.Toolkit.Diagnostics/Attributes/DoesNotReturnAttribute.cs b/Microsoft.Toolkit.Diagnostics/Attributes/DoesNotReturnAttribute.cs
deleted file mode 100644
index 5f11632ac18..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Attributes/DoesNotReturnAttribute.cs
+++ /dev/null
@@ -1,19 +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.
-
-#if !NETSTANDARD2_1_OR_GREATER
-
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Applied to a method that will never return under any circumstance.
-    /// </summary>
-    /// <remarks>Internal copy from the BCL attribute.</remarks>
-    [AttributeUsage(AttributeTargets.Method, Inherited = false)]
-    internal sealed class DoesNotReturnAttribute : Attribute
-    {
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Attributes/DoesNotReturnIfAttribute.cs b/Microsoft.Toolkit.Diagnostics/Attributes/DoesNotReturnIfAttribute.cs
deleted file mode 100644
index 06799235131..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Attributes/DoesNotReturnIfAttribute.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.
-
-#if !NETSTANDARD2_1_OR_GREATER
-
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Specifies that a given <see cref="ParameterValue"/> also indicates
-    /// whether the method will not return (eg. throw an exception).
-    /// </summary>
-    /// <remarks>Internal copy from the BCL attribute.</remarks>
-    [AttributeUsage(AttributeTargets.Parameter)]
-    internal sealed class DoesNotReturnIfAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DoesNotReturnIfAttribute"/> class.
-        /// </summary>
-        /// <param name="parameterValue">
-        /// The condition parameter value. Code after the method will be considered unreachable
-        /// by diagnostics if the argument to the associated parameter matches this value.
-        /// </param>
-        public DoesNotReturnIfAttribute(bool parameterValue)
-        {
-            ParameterValue = parameterValue;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the parameter value should be <see langword="true"/>.
-        /// </summary>
-        public bool ParameterValue { get; }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Attributes/NotNullAttribute.cs b/Microsoft.Toolkit.Diagnostics/Attributes/NotNullAttribute.cs
deleted file mode 100644
index 4595d9d9cd7..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Attributes/NotNullAttribute.cs
+++ /dev/null
@@ -1,20 +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.
-
-#if !NETSTANDARD2_1_OR_GREATER
-
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Specifies that an output will not be <see langword="null"/> even if the corresponding type allows it.
-    /// Specifies that an input argument was not <see langword="null"/> when the call returns.
-    /// </summary>
-    /// <remarks>Internal copy from the BCL attribute.</remarks>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue)]
-    internal sealed class NotNullAttribute : Attribute
-    {
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Attributes/SkipLocalsInitAttribute.cs b/Microsoft.Toolkit.Diagnostics/Attributes/SkipLocalsInitAttribute.cs
deleted file mode 100644
index 39d119f6ad2..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Attributes/SkipLocalsInitAttribute.cs
+++ /dev/null
@@ -1,28 +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.
-
-#if !NET5_0
-
-namespace System.Runtime.CompilerServices
-{
-    /// <summary>
-    /// Used to indicate to the compiler that the <c>.locals init</c> flag should not be set in method headers.
-    /// </summary>
-    /// <remarks>Internal copy from the BCL attribute.</remarks>
-    [AttributeUsage(
-        AttributeTargets.Module |
-        AttributeTargets.Class |
-        AttributeTargets.Struct |
-        AttributeTargets.Interface |
-        AttributeTargets.Constructor |
-        AttributeTargets.Method |
-        AttributeTargets.Property |
-        AttributeTargets.Event,
-        Inherited = false)]
-    internal sealed class SkipLocalsInitAttribute : Attribute
-    {
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Extensions/TypeExtensions.cs b/Microsoft.Toolkit.Diagnostics/Extensions/TypeExtensions.cs
deleted file mode 100644
index 0791e2c0433..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Extensions/TypeExtensions.cs
+++ /dev/null
@@ -1,225 +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.Contracts;
-using System.Linq;
-#if NETSTANDARD1_4
-using System.Reflection;
-#endif
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helpers for working with types.
-    /// </summary>
-    public static class TypeExtensions
-    {
-        /// <summary>
-        /// The mapping of built-in types to their simple representation.
-        /// </summary>
-        private static readonly IReadOnlyDictionary<Type, string> BuiltInTypesMap = new Dictionary<Type, string>
-        {
-            [typeof(bool)] = "bool",
-            [typeof(byte)] = "byte",
-            [typeof(sbyte)] = "sbyte",
-            [typeof(short)] = "short",
-            [typeof(ushort)] = "ushort",
-            [typeof(char)] = "char",
-            [typeof(int)] = "int",
-            [typeof(uint)] = "uint",
-            [typeof(float)] = "float",
-            [typeof(long)] = "long",
-            [typeof(ulong)] = "ulong",
-            [typeof(double)] = "double",
-            [typeof(decimal)] = "decimal",
-            [typeof(object)] = "object",
-            [typeof(string)] = "string",
-            [typeof(void)] = "void"
-        };
-
-        /// <summary>
-        /// A thread-safe mapping of precomputed string representation of types.
-        /// </summary>
-        private static readonly ConditionalWeakTable<Type, string> DisplayNames = new ConditionalWeakTable<Type, string>();
-
-        /// <summary>
-        /// Returns a simple string representation of a type.
-        /// </summary>
-        /// <param name="type">The input type.</param>
-        /// <returns>The string representation of <paramref name="type"/>.</returns>
-        [Pure]
-        public static string ToTypeString(this Type type)
-        {
-            // Local function to create the formatted string for a given type
-            static string FormatDisplayString(Type type, int genericTypeOffset, ReadOnlySpan<Type> typeArguments)
-            {
-                // Primitive types use the keyword name
-                if (BuiltInTypesMap.TryGetValue(type, out string? typeName))
-                {
-                    return typeName!;
-                }
-
-                // 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 genericTypeDefinition = type.GetGenericTypeDefinition();
-
-                    // Nullable<T> types are displayed as T?
-                    if (genericTypeDefinition == typeof(Nullable<>))
-                    {
-                        var nullableArguments = type.GetGenericArguments();
-
-                        return $"{FormatDisplayString(nullableArguments[0], 0, nullableArguments)}?";
-                    }
-
-                    // ValueTuple<T1, T2> types are displayed as (T1, T2)
-                    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<,,,,,,,>))
-                    {
-                        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>
-                    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;
-                }
-
-                // If the type is nested, recursively format the hierarchy as well
-                if (type.IsNested)
-                {
-                    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(openDeclaringType, genericTypeOffset, typeArguments)}.{displayName}";
-                }
-
-                return $"{type.Namespace}.{displayName}";
-            }
-
-            // Atomically get or build the display string for the current type.
-            return DisplayNames.GetValue(type, t =>
-            {
-                // By-ref types are displayed as T&
-                if (t.IsByRef)
-                {
-                    t = t.GetElementType()!;
-
-                    return $"{FormatDisplayString(t, 0, t.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, t.GetGenericArguments())}{new string('*', depth)}";
-                }
-
-                // Standard path for concrete types
-                return FormatDisplayString(t, 0, t.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
-        /// <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>
-        [Pure]
-        private 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><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());
-        }
-#endif
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Extensions/ValueTypeExtensions.cs b/Microsoft.Toolkit.Diagnostics/Extensions/ValueTypeExtensions.cs
deleted file mode 100644
index 8f1e6fbe97a..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Extensions/ValueTypeExtensions.cs
+++ /dev/null
@@ -1,74 +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;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helpers for working with value types.
-    /// </summary>
-    public static class ValueTypeExtensions
-    {
-        /// <summary>
-        /// Gets the table of hex characters (doesn't allocate, maps to .text section, see <see href="https://github.com/dotnet/roslyn/pull/24621"/>).
-        /// </summary>
-        private static ReadOnlySpan<byte> HexCharactersTable => new[]
-        {
-            (byte)'0', (byte)'1', (byte)'2', (byte)'3',
-            (byte)'4', (byte)'5', (byte)'6', (byte)'7',
-            (byte)'8', (byte)'9', (byte)'A', (byte)'B',
-            (byte)'C', (byte)'D', (byte)'E', (byte)'F'
-        };
-
-        /// <summary>
-        /// Returns a hexadecimal <see cref="string"/> representation of a given <typeparamref name="T"/> value, left-padded and ordered as big-endian.
-        /// </summary>
-        /// <typeparam name="T">The input type to format to <see cref="string"/>.</typeparam>
-        /// <param name="value">The input value to format to <see cref="string"/>.</param>
-        /// <returns>
-        /// The hexadecimal representation of <paramref name="value"/> (with the '0x' prefix), left-padded to byte boundaries and ordered as big-endian.
-        /// </returns>
-        /// <remarks>
-        /// As a byte (8 bits) is represented by two hexadecimal digits (each representing a group of 4 bytes), each <see cref="string"/>
-        /// representation will always contain an even number of digits. For instance:
-        /// <code>
-        /// Console.WriteLine(1.ToHexString()); // "0x01"
-        /// Console.WriteLine(((byte)255).ToHexString()); // "0xFF"
-        /// Console.WriteLine((-1).ToHexString()); // "0xFFFFFFFF"
-        /// </code>
-        /// </remarks>
-        [Pure]
-        [SkipLocalsInit]
-        public static unsafe string ToHexString<T>(this T value)
-            where T : unmanaged
-        {
-            int
-                sizeOfT = Unsafe.SizeOf<T>(),
-                bufferSize = (2 * sizeOfT) + 2;
-            char* p = stackalloc char[bufferSize];
-
-            p[0] = '0';
-            p[1] = 'x';
-
-            ref byte rh = ref MemoryMarshal.GetReference(HexCharactersTable);
-
-            for (int i = 0, j = bufferSize - 2; i < sizeOfT; i++, j -= 2)
-            {
-                byte b = ((byte*)&value)[i];
-                int
-                    low = b & 0x0F,
-                    high = (b & 0xF0) >> 4;
-
-                p[j + 1] = (char)Unsafe.Add(ref rh, low);
-                p[j] = (char)Unsafe.Add(ref rh, high);
-            }
-
-            return new string(p, 0, bufferSize);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.g.cs b/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.g.cs
deleted file mode 100644
index 454bc3b7d70..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.g.cs
+++ /dev/null
@@ -1,1827 +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.
-// =====================
-// Auto generated file
-// =====================
-
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Asserts that the input <see cref="Span{T}"/> instance must be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is != 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEmpty<T>(Span<T> span, string name)
-        {
-            if (span.Length == 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEmpty(span, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Span{T}"/> instance must not be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is == 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEmpty<T>(Span<T> span, string name)
-        {
-            if (span.Length != 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEmptyWithSpan<T>(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Span{T}"/> instance must have a size of a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is != <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(Span<T> span, int size, string name)
-        {
-            if (span.Length == size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(span, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Span{T}"/> instance must have a size not equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is == <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeNotEqualTo<T>(Span<T> span, int size, string name)
-        {
-            if (span.Length != size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeNotEqualTo(span, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Span{T}"/> instance must have a size over a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is &lt;= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThan<T>(Span<T> span, int size, string name)
-        {
-            if (span.Length > size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThan(span, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Span{T}"/> instance must have a size of at least or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is &lt; <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThanOrEqualTo<T>(Span<T> span, int size, string name)
-        {
-            if (span.Length >= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(span, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Span{T}"/> instance must have a size of less than a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is >= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThan<T>(Span<T> span, int size, string name)
-        {
-            if (span.Length < size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThan(span, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Span{T}"/> instance must have a size of less than or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is > <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(Span<T> span, int size, string name)
-        {
-            if (span.Length <= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(span, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="Span{T}"/> instance must have the same size of a destination <see cref="Span{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="Span{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="Span{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is != the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(Span<T> source, Span<T> destination, string name)
-        {
-            if (source.Length == destination.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(source, destination, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="Span{T}"/> instance must have a size of less than or equal to that of a destination <see cref="Span{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="Span{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="Span{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is > the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(Span<T> source, Span<T> destination, string name)
-        {
-            if (source.Length <= destination.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(source, destination, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is valid for a given <see cref="Span{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="span"/>.</param>
-        /// <param name="span">The input <see cref="Span{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is not valid to access <paramref name="span"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRangeFor<T>(int index, Span<T> span, string name)
-        {
-            if ((uint)index < (uint)span.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRangeFor(index, span, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is not valid for a given <see cref="Span{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="span"/>.</param>
-        /// <param name="span">The input <see cref="Span{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is valid to access <paramref name="span"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRangeFor<T>(int index, Span<T> span, string name)
-        {
-            if ((uint)index >= (uint)span.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(index, span, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlySpan{T}"/> instance must be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is != 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEmpty<T>(ReadOnlySpan<T> span, string name)
-        {
-            if (span.Length == 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEmpty(span, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlySpan{T}"/> instance must not be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is == 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEmpty<T>(ReadOnlySpan<T> span, string name)
-        {
-            if (span.Length != 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEmptyWithReadOnlySpan<T>(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlySpan{T}"/> instance must have a size of a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is != <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
-        {
-            if (span.Length == size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(span, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlySpan{T}"/> instance must have a size not equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is == <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeNotEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
-        {
-            if (span.Length != size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeNotEqualTo(span, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlySpan{T}"/> instance must have a size over a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is &lt;= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThan<T>(ReadOnlySpan<T> span, int size, string name)
-        {
-            if (span.Length > size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThan(span, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlySpan{T}"/> instance must have a size of at least or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is &lt; <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThanOrEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
-        {
-            if (span.Length >= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(span, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlySpan{T}"/> instance must have a size of less than a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is >= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThan<T>(ReadOnlySpan<T> span, int size, string name)
-        {
-            if (span.Length < size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThan(span, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlySpan{T}"/> instance must have a size of less than or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="span"/> is > <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
-        {
-            if (span.Length <= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(span, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="ReadOnlySpan{T}"/> instance must have the same size of a destination <see cref="ReadOnlySpan{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="ReadOnlySpan{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="ReadOnlySpan{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is != the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(ReadOnlySpan<T> source, Span<T> destination, string name)
-        {
-            if (source.Length == destination.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(source, destination, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="ReadOnlySpan{T}"/> instance must have a size of less than or equal to that of a destination <see cref="ReadOnlySpan{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="ReadOnlySpan{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="ReadOnlySpan{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is > the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(ReadOnlySpan<T> source, Span<T> destination, string name)
-        {
-            if (source.Length <= destination.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(source, destination, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is valid for a given <see cref="ReadOnlySpan{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="span"/>.</param>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is not valid to access <paramref name="span"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
-        {
-            if ((uint)index < (uint)span.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRangeFor(index, span, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is not valid for a given <see cref="ReadOnlySpan{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="span"/>.</param>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is valid to access <paramref name="span"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
-        {
-            if ((uint)index >= (uint)span.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(index, span, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Memory{T}"/> instance must be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is != 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEmpty<T>(Memory<T> memory, string name)
-        {
-            if (memory.Length == 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEmpty(memory, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Memory{T}"/> instance must not be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is == 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEmpty<T>(Memory<T> memory, string name)
-        {
-            if (memory.Length != 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEmpty<Memory<T>>(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Memory{T}"/> instance must have a size of a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is != <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(Memory<T> memory, int size, string name)
-        {
-            if (memory.Length == size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(memory, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Memory{T}"/> instance must have a size not equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is == <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeNotEqualTo<T>(Memory<T> memory, int size, string name)
-        {
-            if (memory.Length != size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeNotEqualTo(memory, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Memory{T}"/> instance must have a size over a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is &lt;= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThan<T>(Memory<T> memory, int size, string name)
-        {
-            if (memory.Length > size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThan(memory, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Memory{T}"/> instance must have a size of at least or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is &lt; <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThanOrEqualTo<T>(Memory<T> memory, int size, string name)
-        {
-            if (memory.Length >= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(memory, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Memory{T}"/> instance must have a size of less than a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is >= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThan<T>(Memory<T> memory, int size, string name)
-        {
-            if (memory.Length < size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThan(memory, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Memory{T}"/> instance must have a size of less than or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is > <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(Memory<T> memory, int size, string name)
-        {
-            if (memory.Length <= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(memory, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="Memory{T}"/> instance must have the same size of a destination <see cref="Memory{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="Memory{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="Memory{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is != the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(Memory<T> source, Memory<T> destination, string name)
-        {
-            if (source.Length == destination.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(source, destination, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="Memory{T}"/> instance must have a size of less than or equal to that of a destination <see cref="Memory{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="Memory{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="Memory{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is > the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(Memory<T> source, Memory<T> destination, string name)
-        {
-            if (source.Length <= destination.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(source, destination, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is valid for a given <see cref="Memory{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="memory"/>.</param>
-        /// <param name="memory">The input <see cref="Memory{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is not valid to access <paramref name="memory"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRangeFor<T>(int index, Memory<T> memory, string name)
-        {
-            if ((uint)index < (uint)memory.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRangeFor(index, memory, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is not valid for a given <see cref="Memory{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="memory"/>.</param>
-        /// <param name="memory">The input <see cref="Memory{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is valid to access <paramref name="memory"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRangeFor<T>(int index, Memory<T> memory, string name)
-        {
-            if ((uint)index >= (uint)memory.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(index, memory, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlyMemory{T}"/> instance must be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is != 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEmpty<T>(ReadOnlyMemory<T> memory, string name)
-        {
-            if (memory.Length == 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEmpty(memory, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlyMemory{T}"/> instance must not be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is == 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEmpty<T>(ReadOnlyMemory<T> memory, string name)
-        {
-            if (memory.Length != 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEmpty<ReadOnlyMemory<T>>(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlyMemory{T}"/> instance must have a size of a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is != <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
-        {
-            if (memory.Length == size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(memory, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlyMemory{T}"/> instance must have a size not equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is == <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeNotEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
-        {
-            if (memory.Length != size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeNotEqualTo(memory, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlyMemory{T}"/> instance must have a size over a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is &lt;= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThan<T>(ReadOnlyMemory<T> memory, int size, string name)
-        {
-            if (memory.Length > size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThan(memory, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlyMemory{T}"/> instance must have a size of at least or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is &lt; <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThanOrEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
-        {
-            if (memory.Length >= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(memory, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlyMemory{T}"/> instance must have a size of less than a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is >= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThan<T>(ReadOnlyMemory<T> memory, int size, string name)
-        {
-            if (memory.Length < size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThan(memory, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ReadOnlyMemory{T}"/> instance must have a size of less than or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="memory"/> is > <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
-        {
-            if (memory.Length <= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(memory, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="ReadOnlyMemory{T}"/> instance must have the same size of a destination <see cref="ReadOnlyMemory{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="ReadOnlyMemory{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="ReadOnlyMemory{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is != the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(ReadOnlyMemory<T> source, Memory<T> destination, string name)
-        {
-            if (source.Length == destination.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(source, destination, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="ReadOnlyMemory{T}"/> instance must have a size of less than or equal to that of a destination <see cref="ReadOnlyMemory{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="ReadOnlyMemory{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="ReadOnlyMemory{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is > the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(ReadOnlyMemory<T> source, Memory<T> destination, string name)
-        {
-            if (source.Length <= destination.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(source, destination, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is valid for a given <see cref="ReadOnlyMemory{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="memory"/>.</param>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is not valid to access <paramref name="memory"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
-        {
-            if ((uint)index < (uint)memory.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRangeFor(index, memory, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is not valid for a given <see cref="ReadOnlyMemory{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="memory"/>.</param>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is valid to access <paramref name="memory"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
-        {
-            if ((uint)index >= (uint)memory.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(index, memory, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see typeparamref="T"/> array instance must be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see typeparamref="T"/> array instance.</typeparam>
-        /// <param name="array">The input <see typeparamref="T"/> array instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="array"/> is != 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEmpty<T>(T[] array, string name)
-        {
-            if (array.Length == 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEmpty(array, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see typeparamref="T"/> array instance must not be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see typeparamref="T"/> array instance.</typeparam>
-        /// <param name="array">The input <see typeparamref="T"/> array instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="array"/> is == 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEmpty<T>(T[] array, string name)
-        {
-            if (array.Length != 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEmpty<T[]>(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see typeparamref="T"/> array instance must have a size of a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see typeparamref="T"/> array instance.</typeparam>
-        /// <param name="array">The input <see typeparamref="T"/> array instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="array"/> is != <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(T[] array, int size, string name)
-        {
-            if (array.Length == size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(array, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see typeparamref="T"/> array instance must have a size not equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see typeparamref="T"/> array instance.</typeparam>
-        /// <param name="array">The input <see typeparamref="T"/> array instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="array"/> is == <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeNotEqualTo<T>(T[] array, int size, string name)
-        {
-            if (array.Length != size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeNotEqualTo(array, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see typeparamref="T"/> array instance must have a size over a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see typeparamref="T"/> array instance.</typeparam>
-        /// <param name="array">The input <see typeparamref="T"/> array instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="array"/> is &lt;= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThan<T>(T[] array, int size, string name)
-        {
-            if (array.Length > size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThan(array, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see typeparamref="T"/> array instance must have a size of at least or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see typeparamref="T"/> array instance.</typeparam>
-        /// <param name="array">The input <see typeparamref="T"/> array instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="array"/> is &lt; <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThanOrEqualTo<T>(T[] array, int size, string name)
-        {
-            if (array.Length >= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(array, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see typeparamref="T"/> array instance must have a size of less than a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see typeparamref="T"/> array instance.</typeparam>
-        /// <param name="array">The input <see typeparamref="T"/> array instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="array"/> is >= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThan<T>(T[] array, int size, string name)
-        {
-            if (array.Length < size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThan(array, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see typeparamref="T"/> array instance must have a size of less than or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see typeparamref="T"/> array instance.</typeparam>
-        /// <param name="array">The input <see typeparamref="T"/> array instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="array"/> is > <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(T[] array, int size, string name)
-        {
-            if (array.Length <= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(array, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see typeparamref="T"/> array instance must have the same size of a destination <see typeparamref="T"/> array instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see typeparamref="T"/> array instance.</typeparam>
-        /// <param name="source">The source <see typeparamref="T"/> array instance to check the size for.</param>
-        /// <param name="destination">The destination <see typeparamref="T"/> array instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is != the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(T[] source, T[] destination, string name)
-        {
-            if (source.Length == destination.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(source, destination, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see typeparamref="T"/> array instance must have a size of less than or equal to that of a destination <see typeparamref="T"/> array instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see typeparamref="T"/> array instance.</typeparam>
-        /// <param name="source">The source <see typeparamref="T"/> array instance to check the size for.</param>
-        /// <param name="destination">The destination <see typeparamref="T"/> array instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is > the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(T[] source, T[] destination, string name)
-        {
-            if (source.Length <= destination.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(source, destination, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is valid for a given <see typeparamref="T"/> array instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see typeparamref="T"/> array instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="array"/>.</param>
-        /// <param name="array">The input <see typeparamref="T"/> array instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is not valid to access <paramref name="array"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRangeFor<T>(int index, T[] array, string name)
-        {
-            if ((uint)index < (uint)array.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRangeFor(index, array, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is not valid for a given <see typeparamref="T"/> array instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see typeparamref="T"/> array instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="array"/>.</param>
-        /// <param name="array">The input <see typeparamref="T"/> array instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is valid to access <paramref name="array"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRangeFor<T>(int index, T[] array, string name)
-        {
-            if ((uint)index >= (uint)array.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(index, array, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="List{T}"/> instance must be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="List{T}"/> instance.</typeparam>
-        /// <param name="list">The input <see cref="List{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="list"/> is != 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEmpty<T>(List<T> list, string name)
-        {
-            if (list.Count == 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEmpty((ICollection<T>)list, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="List{T}"/> instance must not be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="List{T}"/> instance.</typeparam>
-        /// <param name="list">The input <see cref="List{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="list"/> is == 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEmpty<T>(List<T> list, string name)
-        {
-            if (list.Count != 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEmpty<List<T>>(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="List{T}"/> instance must have a size of a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="List{T}"/> instance.</typeparam>
-        /// <param name="list">The input <see cref="List{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="list"/> is != <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(List<T> list, int size, string name)
-        {
-            if (list.Count == size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo((ICollection<T>)list, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="List{T}"/> instance must have a size not equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="List{T}"/> instance.</typeparam>
-        /// <param name="list">The input <see cref="List{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="list"/> is == <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeNotEqualTo<T>(List<T> list, int size, string name)
-        {
-            if (list.Count != size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeNotEqualTo((ICollection<T>)list, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="List{T}"/> instance must have a size over a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="List{T}"/> instance.</typeparam>
-        /// <param name="list">The input <see cref="List{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="list"/> is &lt;= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThan<T>(List<T> list, int size, string name)
-        {
-            if (list.Count > size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThan((ICollection<T>)list, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="List{T}"/> instance must have a size of at least or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="List{T}"/> instance.</typeparam>
-        /// <param name="list">The input <see cref="List{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="list"/> is &lt; <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThanOrEqualTo<T>(List<T> list, int size, string name)
-        {
-            if (list.Count >= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo((ICollection<T>)list, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="List{T}"/> instance must have a size of less than a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="List{T}"/> instance.</typeparam>
-        /// <param name="list">The input <see cref="List{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="list"/> is >= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThan<T>(List<T> list, int size, string name)
-        {
-            if (list.Count < size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThan((ICollection<T>)list, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="List{T}"/> instance must have a size of less than or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="List{T}"/> instance.</typeparam>
-        /// <param name="list">The input <see cref="List{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="list"/> is > <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(List<T> list, int size, string name)
-        {
-            if (list.Count <= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo((ICollection<T>)list, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="List{T}"/> instance must have the same size of a destination <see cref="List{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="List{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="List{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="List{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is != the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(List<T> source, List<T> destination, string name)
-        {
-            if (source.Count == destination.Count)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo((ICollection<T>)source, destination.Count, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="List{T}"/> instance must have a size of less than or equal to that of a destination <see cref="List{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="List{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="List{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="List{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is > the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(List<T> source, List<T> destination, string name)
-        {
-            if (source.Count <= destination.Count)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo((ICollection<T>)source, destination.Count, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is valid for a given <see cref="List{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="List{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="list"/>.</param>
-        /// <param name="list">The input <see cref="List{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is not valid to access <paramref name="list"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRangeFor<T>(int index, List<T> list, string name)
-        {
-            if ((uint)index < (uint)list.Count)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRangeFor(index, (ICollection<T>)list, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is not valid for a given <see cref="List{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="List{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="list"/>.</param>
-        /// <param name="list">The input <see cref="List{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is valid to access <paramref name="list"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRangeFor<T>(int index, List<T> list, string name)
-        {
-            if ((uint)index >= (uint)list.Count)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(index, (ICollection<T>)list, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ICollection{T}"/> instance must be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ICollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="ICollection{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is != 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEmpty<T>(ICollection<T> collection, string name)
-        {
-            if (collection.Count == 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEmpty(collection, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ICollection{T}"/> instance must not be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ICollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="ICollection{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is == 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEmpty<T>(ICollection<T> collection, string name)
-        {
-            if (collection.Count != 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEmpty<ICollection<T>>(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ICollection{T}"/> instance must have a size of a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ICollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="ICollection{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is != <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(ICollection<T> collection, int size, string name)
-        {
-            if (collection.Count == size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(collection, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ICollection{T}"/> instance must have a size not equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ICollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="ICollection{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is == <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeNotEqualTo<T>(ICollection<T> collection, int size, string name)
-        {
-            if (collection.Count != size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeNotEqualTo(collection, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ICollection{T}"/> instance must have a size over a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ICollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="ICollection{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is &lt;= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThan<T>(ICollection<T> collection, int size, string name)
-        {
-            if (collection.Count > size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThan(collection, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ICollection{T}"/> instance must have a size of at least or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ICollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="ICollection{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is &lt; <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThanOrEqualTo<T>(ICollection<T> collection, int size, string name)
-        {
-            if (collection.Count >= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(collection, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ICollection{T}"/> instance must have a size of less than a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ICollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="ICollection{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is >= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThan<T>(ICollection<T> collection, int size, string name)
-        {
-            if (collection.Count < size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThan(collection, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="ICollection{T}"/> instance must have a size of less than or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ICollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="ICollection{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is > <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(ICollection<T> collection, int size, string name)
-        {
-            if (collection.Count <= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(collection, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="ICollection{T}"/> instance must have the same size of a destination <see cref="ICollection{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ICollection{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="ICollection{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="ICollection{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is != the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(ICollection<T> source, ICollection<T> destination, string name)
-        {
-            if (source.Count == destination.Count)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(source, destination.Count, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="ICollection{T}"/> instance must have a size of less than or equal to that of a destination <see cref="ICollection{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ICollection{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="ICollection{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="ICollection{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is > the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(ICollection<T> source, ICollection<T> destination, string name)
-        {
-            if (source.Count <= destination.Count)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(source, destination.Count, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is valid for a given <see cref="ICollection{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ICollection{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="collection"/>.</param>
-        /// <param name="collection">The input <see cref="ICollection{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is not valid to access <paramref name="collection"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRangeFor<T>(int index, ICollection<T> collection, string name)
-        {
-            if ((uint)index < (uint)collection.Count)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRangeFor(index, collection, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is not valid for a given <see cref="ICollection{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="ICollection{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="collection"/>.</param>
-        /// <param name="collection">The input <see cref="ICollection{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is valid to access <paramref name="collection"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRangeFor<T>(int index, ICollection<T> collection, string name)
-        {
-            if ((uint)index >= (uint)collection.Count)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(index, collection, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="IReadOnlyCollection{T}"/> instance must be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="IReadOnlyCollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="IReadOnlyCollection{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is != 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEmpty<T>(IReadOnlyCollection<T> collection, string name)
-        {
-            if (collection.Count == 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEmpty(collection, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="IReadOnlyCollection{T}"/> instance must not be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="IReadOnlyCollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="IReadOnlyCollection{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is == 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEmpty<T>(IReadOnlyCollection<T> collection, string name)
-        {
-            if (collection.Count != 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEmpty<IReadOnlyCollection<T>>(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="IReadOnlyCollection{T}"/> instance must have a size of a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="IReadOnlyCollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="IReadOnlyCollection{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is != <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
-        {
-            if (collection.Count == size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(collection, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="IReadOnlyCollection{T}"/> instance must have a size not equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="IReadOnlyCollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="IReadOnlyCollection{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is == <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeNotEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
-        {
-            if (collection.Count != size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeNotEqualTo(collection, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="IReadOnlyCollection{T}"/> instance must have a size over a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="IReadOnlyCollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="IReadOnlyCollection{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is &lt;= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThan<T>(IReadOnlyCollection<T> collection, int size, string name)
-        {
-            if (collection.Count > size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThan(collection, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="IReadOnlyCollection{T}"/> instance must have a size of at least or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="IReadOnlyCollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="IReadOnlyCollection{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is &lt; <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThanOrEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
-        {
-            if (collection.Count >= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(collection, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="IReadOnlyCollection{T}"/> instance must have a size of less than a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="IReadOnlyCollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="IReadOnlyCollection{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is >= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThan<T>(IReadOnlyCollection<T> collection, int size, string name)
-        {
-            if (collection.Count < size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThan(collection, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="IReadOnlyCollection{T}"/> instance must have a size of less than or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="IReadOnlyCollection{T}"/> instance.</typeparam>
-        /// <param name="collection">The input <see cref="IReadOnlyCollection{T}"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="collection"/> is > <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
-        {
-            if (collection.Count <= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(collection, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="IReadOnlyCollection{T}"/> instance must have the same size of a destination <see cref="IReadOnlyCollection{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="IReadOnlyCollection{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="IReadOnlyCollection{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="IReadOnlyCollection{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is != the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(IReadOnlyCollection<T> source, ICollection<T> destination, string name)
-        {
-            if (source.Count == destination.Count)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(source, destination.Count, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="IReadOnlyCollection{T}"/> instance must have a size of less than or equal to that of a destination <see cref="IReadOnlyCollection{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="IReadOnlyCollection{T}"/> instance.</typeparam>
-        /// <param name="source">The source <see cref="IReadOnlyCollection{T}"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="IReadOnlyCollection{T}"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is > the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(IReadOnlyCollection<T> source, ICollection<T> destination, string name)
-        {
-            if (source.Count <= destination.Count)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(source, destination.Count, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is valid for a given <see cref="IReadOnlyCollection{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="IReadOnlyCollection{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="collection"/>.</param>
-        /// <param name="collection">The input <see cref="IReadOnlyCollection{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is not valid to access <paramref name="collection"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
-        {
-            if ((uint)index < (uint)collection.Count)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRangeFor(index, collection, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is not valid for a given <see cref="IReadOnlyCollection{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <see cref="IReadOnlyCollection{T}"/> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="collection"/>.</param>
-        /// <param name="collection">The input <see cref="IReadOnlyCollection{T}"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is valid to access <paramref name="collection"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
-        {
-            if ((uint)index >= (uint)collection.Count)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(index, collection, name);
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.tt b/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.tt
deleted file mode 100644
index 22bf00947e7..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.tt
+++ /dev/null
@@ -1,301 +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.
-<#@include file="TypeInfo.ttinclude" #>
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-<#
-GenerateTextForItems(EnumerableTypes, item =>
-{
-#>
-        /// <summary>
-        /// Asserts that the input <#=item.XmlType#> instance must be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <#=item.XmlType#> instance.</typeparam>
-        /// <param name="<#=item.Name#>">The input <#=item.XmlType#> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="<#=item.Name#>"/> is != 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEmpty<T>(<#=item.Type#> <#=item.Name#>, string name)
-        {
-            if (<#=item.Name#>.<#=item.Size#> == 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEmpty(<#=item.Cast#><#=item.Name#>, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <#=item.XmlType#> instance must not be empty.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <#=item.XmlType#> instance.</typeparam>
-        /// <param name="<#=item.Name#>">The input <#=item.XmlType#> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="<#=item.Name#>"/> is == 0.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEmpty<T>(<#=item.Type#> <#=item.Name#>, string name)
-        {
-            if (<#=item.Name#>.<#=item.Size#> != 0)
-            {
-                return;
-            }
-
-<#
-    if (item.Type == "Span<T>")
-    {
-#>
-            ThrowHelper.ThrowArgumentExceptionForIsNotEmptyWithSpan<T>(name);
-<#
-    }
-    else if (item.Type == "ReadOnlySpan<T>")
-    {
-#>
-            ThrowHelper.ThrowArgumentExceptionForIsNotEmptyWithReadOnlySpan<T>(name);
-<#
-    }
-    else
-    {
-#>
-            ThrowHelper.ThrowArgumentExceptionForIsNotEmpty<<#=item.Type#>>(name);
-<#
-    }
-#>
-        }
-
-        /// <summary>
-        /// Asserts that the input <#=item.XmlType#> instance must have a size of a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <#=item.XmlType#> instance.</typeparam>
-        /// <param name="<#=item.Name#>">The input <#=item.XmlType#> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="<#=item.Name#>"/> is != <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
-        {
-            if (<#=item.Name#>.<#=item.Size#> == size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(<#=item.Cast#><#=item.Name#>, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <#=item.XmlType#> instance must have a size not equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <#=item.XmlType#> instance.</typeparam>
-        /// <param name="<#=item.Name#>">The input <#=item.XmlType#> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="<#=item.Name#>"/> is == <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeNotEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
-        {
-            if (<#=item.Name#>.<#=item.Size#> != size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeNotEqualTo(<#=item.Cast#><#=item.Name#>, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <#=item.XmlType#> instance must have a size over a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <#=item.XmlType#> instance.</typeparam>
-        /// <param name="<#=item.Name#>">The input <#=item.XmlType#> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="<#=item.Name#>"/> is &lt;= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThan<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
-        {
-            if (<#=item.Name#>.<#=item.Size#> > size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThan(<#=item.Cast#><#=item.Name#>, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <#=item.XmlType#> instance must have a size of at least or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <#=item.XmlType#> instance.</typeparam>
-        /// <param name="<#=item.Name#>">The input <#=item.XmlType#> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="<#=item.Name#>"/> is &lt; <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThanOrEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
-        {
-            if (<#=item.Name#>.<#=item.Size#> >= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(<#=item.Cast#><#=item.Name#>, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <#=item.XmlType#> instance must have a size of less than a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <#=item.XmlType#> instance.</typeparam>
-        /// <param name="<#=item.Name#>">The input <#=item.XmlType#> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="<#=item.Name#>"/> is >= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThan<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
-        {
-            if (<#=item.Name#>.<#=item.Size#> < size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThan(<#=item.Cast#><#=item.Name#>, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <#=item.XmlType#> instance must have a size of less than or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <#=item.XmlType#> instance.</typeparam>
-        /// <param name="<#=item.Name#>">The input <#=item.XmlType#> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="<#=item.Name#>"/> is > <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
-        {
-            if (<#=item.Name#>.<#=item.Size#> <= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(<#=item.Cast#><#=item.Name#>, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <#=item.XmlType#> instance must have the same size of a destination <#=item.XmlType#> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <#=item.XmlType#> instance.</typeparam>
-        /// <param name="source">The source <#=item.XmlType#> instance to check the size for.</param>
-        /// <param name="destination">The destination <#=item.XmlType#> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is != the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo<T>(<#=item.Type#> source, <#=item.DestinationType#> destination, string name)
-        {
-            if (source.<#=item.Size#> == destination.<#=item.Size#>)
-            {
-                return;
-            }
-
-<#
-    if (item.HasCountProperty)
-    {
-#>
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(<#=item.Cast#>source, destination.<#=item.Size#>, name);
-<#
-    }
-    else
-    {
-#>
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(source, <#=item.Cast#>destination, name);
-<#
-    }
-#>
-        }
-
-        /// <summary>
-        /// Asserts that the source <#=item.XmlType#> instance must have a size of less than or equal to that of a destination <#=item.XmlType#> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <#=item.XmlType#> instance.</typeparam>
-        /// <param name="source">The source <#=item.XmlType#> instance to check the size for.</param>
-        /// <param name="destination">The destination <#=item.XmlType#> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is > the one of <paramref name="destination"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo<T>(<#=item.Type#> source, <#=item.DestinationType#> destination, string name)
-        {
-            if (source.<#=item.Size#> <= destination.<#=item.Size#>)
-            {
-                return;
-            }
-
-<#
-    if (item.HasCountProperty)
-    {
-#>
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(<#=item.Cast#>source, destination.<#=item.Size#>, name);
-<#
-    }
-    else
-    {
-#>
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(source, <#=item.Cast#>destination, name);
-<#
-    }
-#>
-        }
-
-        /// <summary>
-        /// Asserts that the input index is valid for a given <#=item.XmlType#> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <#=item.XmlType#> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="<#=item.Name#>"/>.</param>
-        /// <param name="<#=item.Name#>">The input <#=item.XmlType#> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is not valid to access <paramref name="<#=item.Name#>"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
-        {
-<#
-    // Here we're leveraging the fact that signed integers are represented
-    // in 2-complement to perform the bounds check with a single compare operation.
-    // This is the same trick used throughout CoreCLR as well.
-    // For more info and code sample, see the original conversation here:
-    // https://github.com/CommunityToolkit/WindowsCommunityToolkit/pull/3131#discussion_r390682835
-#>
-            if ((uint)index < (uint)<#=item.Name#>.<#=item.Size#>)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRangeFor(index, <#=item.Cast#><#=item.Name#>, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is not valid for a given <#=item.XmlType#> instance.
-        /// </summary>
-        /// <typeparam name="T">The item of items in the input <#=item.XmlType#> instance.</typeparam>
-        /// <param name="index">The input index to be used to access <paramref name="<#=item.Name#>"/>.</param>
-        /// <param name="<#=item.Name#>">The input <#=item.XmlType#> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is valid to access <paramref name="<#=item.Name#>"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
-        {
-            if ((uint)index >= (uint)<#=item.Name#>.<#=item.Size#>)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(index, <#=item.Cast#><#=item.Name#>, name);
-        }
-<#
-});
-#>
-    }
-}
diff --git a/Microsoft.Toolkit.Diagnostics/Generated/Guard.Comparable.Numeric.g.cs b/Microsoft.Toolkit.Diagnostics/Generated/Guard.Comparable.Numeric.g.cs
deleted file mode 100644
index 953f007578b..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Generated/Guard.Comparable.Numeric.g.cs
+++ /dev/null
@@ -1,3532 +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.
-// =====================
-// Auto generated file
-// =====================
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="byte"/> value to test.</param>
-        /// <param name="target">The target <see cref="byte"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(byte value, byte target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="byte"/> value to test.</param>
-        /// <param name="target">The target <see cref="byte"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(byte value, byte target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="byte"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(byte value, byte maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="byte"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(byte value, byte maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="byte"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(byte value, byte minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="byte"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(byte value, byte minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="byte"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(byte value, byte minimum, byte maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="byte"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(byte value, byte minimum, byte maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="byte"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(byte value, byte minimum, byte maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="byte"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(byte value, byte minimum, byte maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="byte"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(byte value, byte minimum, byte maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="byte"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="byte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(byte value, byte minimum, byte maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="sbyte"/> value to test.</param>
-        /// <param name="target">The target <see cref="sbyte"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(sbyte value, sbyte target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="sbyte"/> value to test.</param>
-        /// <param name="target">The target <see cref="sbyte"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(sbyte value, sbyte target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="sbyte"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(sbyte value, sbyte maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="sbyte"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(sbyte value, sbyte maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="sbyte"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(sbyte value, sbyte minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="sbyte"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(sbyte value, sbyte minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="sbyte"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(sbyte value, sbyte minimum, sbyte maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="sbyte"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(sbyte value, sbyte minimum, sbyte maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="sbyte"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(sbyte value, sbyte minimum, sbyte maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="sbyte"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(sbyte value, sbyte minimum, sbyte maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="sbyte"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(sbyte value, sbyte minimum, sbyte maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="sbyte"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="sbyte"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(sbyte value, sbyte minimum, sbyte maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="short"/> value to test.</param>
-        /// <param name="target">The target <see cref="short"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(short value, short target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="short"/> value to test.</param>
-        /// <param name="target">The target <see cref="short"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(short value, short target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="short"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="short"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(short value, short maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="short"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="short"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(short value, short maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="short"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="short"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(short value, short minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="short"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="short"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(short value, short minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="short"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="short"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="short"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(short value, short minimum, short maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="short"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="short"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="short"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(short value, short minimum, short maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="short"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="short"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="short"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(short value, short minimum, short maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="short"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="short"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="short"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(short value, short minimum, short maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="short"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="short"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="short"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(short value, short minimum, short maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="short"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="short"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="short"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(short value, short minimum, short maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ushort"/> value to test.</param>
-        /// <param name="target">The target <see cref="ushort"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(ushort value, ushort target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ushort"/> value to test.</param>
-        /// <param name="target">The target <see cref="ushort"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(ushort value, ushort target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ushort"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(ushort value, ushort maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ushort"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(ushort value, ushort maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ushort"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(ushort value, ushort minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ushort"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(ushort value, ushort minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="ushort"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(ushort value, ushort minimum, ushort maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="ushort"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(ushort value, ushort minimum, ushort maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="ushort"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(ushort value, ushort minimum, ushort maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="ushort"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(ushort value, ushort minimum, ushort maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="ushort"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(ushort value, ushort minimum, ushort maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="ushort"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="ushort"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(ushort value, ushort minimum, ushort maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="char"/> value to test.</param>
-        /// <param name="target">The target <see cref="char"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(char value, char target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="char"/> value to test.</param>
-        /// <param name="target">The target <see cref="char"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(char value, char target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="char"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="char"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(char value, char maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="char"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="char"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(char value, char maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="char"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="char"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(char value, char minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="char"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="char"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(char value, char minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="char"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="char"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="char"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(char value, char minimum, char maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="char"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="char"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="char"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(char value, char minimum, char maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="char"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="char"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="char"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(char value, char minimum, char maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="char"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="char"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="char"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(char value, char minimum, char maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="char"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="char"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="char"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(char value, char minimum, char maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="char"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="char"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="char"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(char value, char minimum, char maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="target">The target <see cref="int"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(int value, int target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="target">The target <see cref="int"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(int value, int target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="int"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(int value, int maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="int"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(int value, int maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="int"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(int value, int minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="int"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(int value, int minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="int"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="int"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(int value, int minimum, int maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="int"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="int"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(int value, int minimum, int maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="int"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="int"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(int value, int minimum, int maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="int"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="int"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(int value, int minimum, int maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="int"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="int"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(int value, int minimum, int maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="int"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="int"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(int value, int minimum, int maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value to test.</param>
-        /// <param name="target">The target <see cref="uint"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(uint value, uint target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value to test.</param>
-        /// <param name="target">The target <see cref="uint"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(uint value, uint target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(uint value, uint maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(uint value, uint maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(uint value, uint minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(uint value, uint minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(uint value, uint minimum, uint maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(uint value, uint minimum, uint maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(uint value, uint minimum, uint maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(uint value, uint minimum, uint maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(uint value, uint minimum, uint maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="uint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(uint value, uint minimum, uint maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="target">The target <see cref="float"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(float value, float target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="target">The target <see cref="float"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(float value, float target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="float"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(float value, float maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="float"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(float value, float maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="float"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(float value, float minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="float"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(float value, float minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="float"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="float"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(float value, float minimum, float maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="float"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="float"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(float value, float minimum, float maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="float"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="float"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(float value, float minimum, float maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="float"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="float"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(float value, float minimum, float maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="float"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="float"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(float value, float minimum, float maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="float"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="float"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(float value, float minimum, float maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="target">The target <see cref="long"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(long value, long target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="target">The target <see cref="long"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(long value, long target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="long"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(long value, long maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="long"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(long value, long maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="long"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(long value, long minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="long"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(long value, long minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="long"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="long"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(long value, long minimum, long maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="long"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="long"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(long value, long minimum, long maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="long"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="long"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(long value, long minimum, long maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="long"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="long"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(long value, long minimum, long maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="long"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="long"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(long value, long minimum, long maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="long"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="long"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(long value, long minimum, long maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value to test.</param>
-        /// <param name="target">The target <see cref="ulong"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(ulong value, ulong target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value to test.</param>
-        /// <param name="target">The target <see cref="ulong"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(ulong value, ulong target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(ulong value, ulong maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(ulong value, ulong maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(ulong value, ulong minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(ulong value, ulong minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(ulong value, ulong minimum, ulong maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(ulong value, ulong minimum, ulong maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(ulong value, ulong minimum, ulong maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(ulong value, ulong minimum, ulong maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(ulong value, ulong minimum, ulong maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="ulong"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(ulong value, ulong minimum, ulong maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="target">The target <see cref="double"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(double value, double target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="target">The target <see cref="double"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(double value, double target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="double"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(double value, double maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="double"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(double value, double maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="double"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(double value, double minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="double"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(double value, double minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="double"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="double"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(double value, double minimum, double maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="double"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="double"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(double value, double minimum, double maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="double"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="double"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(double value, double minimum, double maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="double"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="double"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(double value, double minimum, double maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="double"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="double"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(double value, double minimum, double maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="double"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="double"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(double value, double minimum, double maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="decimal"/> value to test.</param>
-        /// <param name="target">The target <see cref="decimal"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(decimal value, decimal target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="decimal"/> value to test.</param>
-        /// <param name="target">The target <see cref="decimal"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(decimal value, decimal target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="decimal"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(decimal value, decimal maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="decimal"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(decimal value, decimal maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="decimal"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(decimal value, decimal minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="decimal"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(decimal value, decimal minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="decimal"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(decimal value, decimal minimum, decimal maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see cref="decimal"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(decimal value, decimal minimum, decimal maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="decimal"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(decimal value, decimal minimum, decimal maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="decimal"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(decimal value, decimal minimum, decimal maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="decimal"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(decimal value, decimal minimum, decimal maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see cref="decimal"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see cref="decimal"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(decimal value, decimal minimum, decimal maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="target">The target <see langword="nint"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(nint value, nint target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="target">The target <see langword="nint"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(nint value, nint target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(nint value, nint maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(nint value, nint maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(nint value, nint minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(nint value, nint minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(nint value, nint minimum, nint maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(nint value, nint minimum, nint maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(nint value, nint minimum, nint maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(nint value, nint minimum, nint maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(nint value, nint minimum, nint maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see langword="nint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(nint value, nint minimum, nint maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nuint"/> value to test.</param>
-        /// <param name="target">The target <see langword="nuint"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(nuint value, nuint target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nuint"/> value to test.</param>
-        /// <param name="target">The target <see langword="nuint"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(nuint value, nuint target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nuint"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(nuint value, nuint maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nuint"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(nuint value, nuint maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nuint"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(nuint value, nuint minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nuint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(nuint value, nuint minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see langword="nuint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(nuint value, nuint minimum, nuint maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see langword="nuint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(nuint value, nuint minimum, nuint maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see langword="nuint"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(nuint value, nuint minimum, nuint maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see langword="nuint"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(nuint value, nuint minimum, nuint maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see langword="nuint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(nuint value, nuint minimum, nuint maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see langword="nuint"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see langword="nuint"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(nuint value, nuint minimum, nuint maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Diagnostics/Generated/Guard.Comparable.Numeric.tt b/Microsoft.Toolkit.Diagnostics/Generated/Guard.Comparable.Numeric.tt
deleted file mode 100644
index 3f5f0032b06..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Generated/Guard.Comparable.Numeric.tt
+++ /dev/null
@@ -1,274 +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.
-<#@include file="TypeInfo.ttinclude" #>
-using System;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-<#
-GenerateTextForItems(NumericTypes, typeInfo =>
-{
-    var (type, prefix) = typeInfo;
-#>
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see <#=prefix#>="<#=type#>"/> value to test.</param>
-        /// <param name="target">The target <see <#=prefix#>="<#=type#>"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo(<#=type#> value, <#=type#> target, string name)
-        {
-            if (value == target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see <#=prefix#>="<#=type#>"/> value to test.</param>
-        /// <param name="target">The target <see <#=prefix#>="<#=type#>"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo(<#=type#> value, <#=type#> target, string name)
-        {
-            if (value != target)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see <#=prefix#>="<#=type#>"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan(<#=type#> value, <#=type#> maximum, string name)
-        {
-            if (value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see <#=prefix#>="<#=type#>"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo(<#=type#> value, <#=type#> maximum, string name)
-        {
-            if (value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <param name="value">The input <see <#=prefix#>="<#=type#>"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan(<#=type#> value, <#=type#> minimum, string name)
-        {
-            if (value > minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see <#=prefix#>="<#=type#>"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo(<#=type#> value, <#=type#> minimum, string name)
-        {
-            if (value >= minimum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see <#=prefix#>="<#=type#>"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange(<#=type#> value, <#=type#> minimum, <#=type#> maximum, string name)
-        {
-            if (value >= minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <param name="value">The input <see <#=prefix#>="<#=type#>"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange(<#=type#> value, <#=type#> minimum, <#=type#> maximum, string name)
-        {
-            if (value < minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see <#=prefix#>="<#=type#>"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween(<#=type#> value, <#=type#> minimum, <#=type#> maximum, string name)
-        {
-            if (value > minimum && value < maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see <#=prefix#>="<#=type#>"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween(<#=type#> value, <#=type#> minimum, <#=type#> maximum, string name)
-        {
-            if (value <= minimum || value >= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see <#=prefix#>="<#=type#>"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo(<#=type#> value, <#=type#> minimum, <#=type#> maximum, string name)
-        {
-            if (value >= minimum && value <= maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <param name="value">The input <see <#=prefix#>="<#=type#>"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <see <#=prefix#>="<#=type#>"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo(<#=type#> value, <#=type#> minimum, <#=type#> maximum, string name)
-        {
-            if (value < minimum || value > maximum)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-<#
-});
-#>
-    }
-}
diff --git a/Microsoft.Toolkit.Diagnostics/Generated/Guard.md b/Microsoft.Toolkit.Diagnostics/Generated/Guard.md
deleted file mode 100644
index 6b381a62b90..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Generated/Guard.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# T4 templates and generated APIs
-
-This folder contains a number of template files (with the `.tt` or `.ttinclude` extensions) and the generated `.g.cs` files generated by those templates. The template files use the T4 format, which is natively supported by Visual Studio (more info is available [here](https://docs.microsoft.com/en-us/visualstudio/modeling/code-generation-and-t4-text-templates?view=vs-2019)).
-
-## Why is this needed?
-
-There are a few reasons why T4 templates are used for the `Guard` class:
-
- - Especially when a large number of similar overloads are available for the same APIs, using templates makes it much easier to maintain code and spot mistakes, as the actual number of lines of code to review is much smaller: it's just the code in each template!
- - Using type-specific overloads instead of generic methods can result in faster code. For instance, T4 templates are used to generate overloads for comparison APIs (eg. `Guard.IsGreaterThan(int, int, string)`). This results in more compact and optimized code as opposed to a generic method using `where T : IComparable<T>` as type constraint.
- - In some cases, using generic methods just isn't possible. For instance, types like `Span<T>` and `ReadOnlySpan<T>` can't be used as generic type parameters, and even if that had been possible, they don't implement an interface we could use in the generic type constraint. Using T4 templates solves this issue, as we can just have specialized method for each supported type or collection type.
-
-## How to make changes
-
-If you need to change an API that is declared in a template, or to add a new one, just edit the right `.tt` file and save it: Visual Studio will take care of updating the generated `.g.cs` file automatically. Don't make changes to those generated `.g.cs` files directly, as those will be overwritten as soon as their source template is updated.
-
-Note that all the `.g.cs` files are checked in into the repository, so if you do make changes to a template file, make sure to also include the updated `.g.cs` file in your commits.
diff --git a/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.g.cs b/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.g.cs
deleted file mode 100644
index da2f40d7356..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.g.cs
+++ /dev/null
@@ -1,817 +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.
-// =====================
-// Auto generated file
-// =====================
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Helper methods to efficiently throw exceptions.
-        /// </summary>
-        private static partial class ThrowHelper
-        {
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsEmpty{T}(T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsEmpty<T>(Span<T> span, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Span<T>).ToTypeString()}) must be empty, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> span, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Span<T>).ToTypeString()}) must have a size equal to {size}, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeNotEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Span<T> span, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Span<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Span<T> span, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Span<T>).ToTypeString()}) must have a size over {size}, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Span<T> span, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Span<T>).ToTypeString()}) must have a size of at least {size}, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThan<T>(Span<T> span, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Span<T>).ToTypeString()}) must have a size less than {size}, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T> span, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Span<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Span<T> source, Span<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(Span<T>).ToTypeString()}) must have a size equal to {AssertString(destination.Length)} (the destination), had a size of {AssertString(source.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Span<T> source, Span<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(Span<T>).ToTypeString()}) must have a size less than or equal to {AssertString(destination.Length)} (the destination), had a size of {AssertString(source.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, Span<T> span, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must be in the range given by <0> and {AssertString(span.Length)} to be a valid index for the target collection ({typeof(Span<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsNotInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, Span<T> span, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must not be in the range given by <0> and {AssertString(span.Length)} to be an invalid index for the target collection ({typeof(Span<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsEmpty{T}(T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlySpan<T> span, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must be empty, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size equal to {size}, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeNotEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlySpan<T> span, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size over {size}, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size of at least {size}, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlySpan<T> span, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size less than {size}, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlySpan<T> span, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {AssertString(span.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlySpan<T> source, Span<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size equal to {AssertString(destination.Length)} (the destination), had a size of {AssertString(source.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlySpan<T> source, Span<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must have a size less than or equal to {AssertString(destination.Length)} (the destination), had a size of {AssertString(source.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must be in the range given by <0> and {AssertString(span.Length)} to be a valid index for the target collection ({typeof(ReadOnlySpan<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsNotInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ReadOnlySpan<T> span, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must not be in the range given by <0> and {AssertString(span.Length)} to be an invalid index for the target collection ({typeof(ReadOnlySpan<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsEmpty{T}(T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsEmpty<T>(Memory<T> memory, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Memory<T>).ToTypeString()}) must be empty, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> memory, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Memory<T>).ToTypeString()}) must have a size equal to {size}, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeNotEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(Memory<T> memory, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Memory<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(Memory<T> memory, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Memory<T>).ToTypeString()}) must have a size over {size}, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(Memory<T> memory, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Memory<T>).ToTypeString()}) must have a size of at least {size}, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThan<T>(Memory<T> memory, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Memory<T>).ToTypeString()}) must have a size less than {size}, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory<T> memory, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Memory<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(Memory<T> source, Memory<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(Memory<T>).ToTypeString()}) must have a size equal to {AssertString(destination.Length)} (the destination), had a size of {AssertString(source.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(Memory<T> source, Memory<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(Memory<T>).ToTypeString()}) must have a size less than or equal to {AssertString(destination.Length)} (the destination), had a size of {AssertString(source.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, Memory<T> memory, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must be in the range given by <0> and {AssertString(memory.Length)} to be a valid index for the target collection ({typeof(Memory<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsNotInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, Memory<T> memory, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must not be in the range given by <0> and {AssertString(memory.Length)} to be an invalid index for the target collection ({typeof(Memory<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsEmpty{T}(T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsEmpty<T>(ReadOnlyMemory<T> memory, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must be empty, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size equal to {size}, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeNotEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ReadOnlyMemory<T> memory, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size over {size}, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size of at least {size}, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThan<T>(ReadOnlyMemory<T> memory, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size less than {size}, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlyMemory<T> memory, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {AssertString(memory.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ReadOnlyMemory<T> source, Memory<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size equal to {AssertString(destination.Length)} (the destination), had a size of {AssertString(source.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ReadOnlyMemory<T> source, Memory<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(ReadOnlyMemory<T>).ToTypeString()}) must have a size less than or equal to {AssertString(destination.Length)} (the destination), had a size of {AssertString(source.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must be in the range given by <0> and {AssertString(memory.Length)} to be a valid index for the target collection ({typeof(ReadOnlyMemory<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsNotInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ReadOnlyMemory<T> memory, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must not be in the range given by <0> and {AssertString(memory.Length)} to be an invalid index for the target collection ({typeof(ReadOnlyMemory<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsEmpty{T}(T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsEmpty<T>(T[] array, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T[]).ToTypeString()}) must be empty, had a size of {AssertString(array.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] array, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T[]).ToTypeString()}) must have a size equal to {size}, had a size of {AssertString(array.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeNotEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(T[] array, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T[]).ToTypeString()}) must have a size not equal to {size}, had a size of {AssertString(array.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(T[] array, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T[]).ToTypeString()}) must have a size over {size}, had a size of {AssertString(array.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(T[] array, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T[]).ToTypeString()}) must have a size of at least {size}, had a size of {AssertString(array.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThan<T>(T[] array, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T[]).ToTypeString()}) must have a size less than {size}, had a size of {AssertString(array.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] array, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T[]).ToTypeString()}) must have a size less than or equal to {size}, had a size of {AssertString(array.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(T[] source, T[] destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(T[]).ToTypeString()}) must have a size equal to {AssertString(destination.Length)} (the destination), had a size of {AssertString(source.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(T[] source, T[] destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(T[]).ToTypeString()}) must have a size less than or equal to {AssertString(destination.Length)} (the destination), had a size of {AssertString(source.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, T[] array, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must be in the range given by <0> and {AssertString(array.Length)} to be a valid index for the target collection ({typeof(T[]).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsNotInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, T[] array, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must not be in the range given by <0> and {AssertString(array.Length)} to be an invalid index for the target collection ({typeof(T[]).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsEmpty{T}(T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsEmpty<T>(List<T> list, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(List<T>).ToTypeString()}) must be empty, had a size of {AssertString(list.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> list, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(List<T>).ToTypeString()}) must have a size equal to {size}, had a size of {AssertString(list.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeNotEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(List<T> list, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(List<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {AssertString(list.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(List<T> list, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(List<T>).ToTypeString()}) must have a size over {size}, had a size of {AssertString(list.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(List<T> list, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(List<T>).ToTypeString()}) must have a size of at least {size}, had a size of {AssertString(list.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThan<T>(List<T> list, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(List<T>).ToTypeString()}) must have a size less than {size}, had a size of {AssertString(list.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T> list, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(List<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {AssertString(list.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(List<T> source, List<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(List<T>).ToTypeString()}) must have a size equal to {AssertString(destination.Count)} (the destination), had a size of {AssertString(source.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(List<T> source, List<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(List<T>).ToTypeString()}) must have a size less than or equal to {AssertString(destination.Count)} (the destination), had a size of {AssertString(source.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, List<T> list, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must be in the range given by <0> and {AssertString(list.Count)} to be a valid index for the target collection ({typeof(List<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsNotInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, List<T> list, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must not be in the range given by <0> and {AssertString(list.Count)} to be an invalid index for the target collection ({typeof(List<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsEmpty{T}(T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsEmpty<T>(ICollection<T> collection, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ICollection<T>).ToTypeString()}) must be empty, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> collection, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ICollection<T>).ToTypeString()}) must have a size equal to {size}, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeNotEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(ICollection<T> collection, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ICollection<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(ICollection<T> collection, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ICollection<T>).ToTypeString()}) must have a size over {size}, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(ICollection<T> collection, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ICollection<T>).ToTypeString()}) must have a size of at least {size}, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThan<T>(ICollection<T> collection, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ICollection<T>).ToTypeString()}) must have a size less than {size}, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ICollection<T> collection, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ICollection<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(ICollection<T> source, ICollection<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(ICollection<T>).ToTypeString()}) must have a size equal to {AssertString(destination.Count)} (the destination), had a size of {AssertString(source.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(ICollection<T> source, ICollection<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(ICollection<T>).ToTypeString()}) must have a size less than or equal to {AssertString(destination.Count)} (the destination), had a size of {AssertString(source.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, ICollection<T> collection, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must be in the range given by <0> and {AssertString(collection.Count)} to be a valid index for the target collection ({typeof(ICollection<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsNotInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, ICollection<T> collection, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must not be in the range given by <0> and {AssertString(collection.Count)} to be an invalid index for the target collection ({typeof(ICollection<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsEmpty{T}(T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsEmpty<T>(IReadOnlyCollection<T> collection, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must be empty, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size equal to {size}, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeNotEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size not equal to {size}, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(IReadOnlyCollection<T> collection, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size over {size}, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size of at least {size}, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThan<T>(IReadOnlyCollection<T> collection, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size less than {size}, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadOnlyCollection<T> collection, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {AssertString(collection.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(IReadOnlyCollection<T> source, ICollection<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size equal to {AssertString(destination.Count)} (the destination), had a size of {AssertString(source.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(IReadOnlyCollection<T> source, ICollection<T> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(IReadOnlyCollection<T>).ToTypeString()}) must have a size less than or equal to {AssertString(destination.Count)} (the destination), had a size of {AssertString(source.Count)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must be in the range given by <0> and {AssertString(collection.Count)} to be a valid index for the target collection ({typeof(IReadOnlyCollection<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsNotInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, IReadOnlyCollection<T> collection, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must not be in the range given by <0> and {AssertString(collection.Count)} to be an invalid index for the target collection ({typeof(IReadOnlyCollection<T>).ToTypeString()}), was {AssertString(index)}");
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.tt b/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.tt
deleted file mode 100644
index 9df173d5807..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.tt
+++ /dev/null
@@ -1,128 +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.
-<#@include file="TypeInfo.ttinclude" #>
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Helper methods to efficiently throw exceptions.
-        /// </summary>
-        private static partial class ThrowHelper
-        {
-<#
-GenerateTextForItems(EnumerableTypes, item =>
-{
-#>
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsEmpty{T}(T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsEmpty<T>(<#=item.Type#> <#=item.Name#>, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(<#=item.Type#>).ToTypeString()}) must be empty, had a size of {AssertString(<#=item.Name#>.<#=item.Size#>)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size equal to {size}, had a size of {AssertString(<#=item.Name#>.<#=item.Size#>)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeNotEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeNotEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size not equal to {size}, had a size of {AssertString(<#=item.Name#>.<#=item.Size#>)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThan<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size over {size}, had a size of {AssertString(<#=item.Name#>.<#=item.Size#>)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size of at least {size}, had a size of {AssertString(<#=item.Name#>.<#=item.Size#>)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThan{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThan<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size less than {size}, had a size of {AssertString(<#=item.Name#>.<#=item.Size#>)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],int,string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(<#=item.Type#> <#=item.Name#>, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size less than or equal to {size}, had a size of {AssertString(<#=item.Name#>.<#=item.Size#>)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo<T>(<#=item.Type#> source, <#=item.DestinationType#> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size equal to {AssertString(destination.<#=item.Size#>)} (the destination), had a size of {AssertString(source.<#=item.Size#>)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo{T}(T[],T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo<T>(<#=item.Type#> source, <#=item.DestinationType#> destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} ({typeof(<#=item.Type#>).ToTypeString()}) must have a size less than or equal to {AssertString(destination.<#=item.Size#>)} (the destination), had a size of {AssertString(source.<#=item.Size#>)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must be in the range given by <0> and {AssertString(<#=item.Name#>.<#=item.Size#>)} to be a valid index for the target collection ({typeof(<#=item.Type#>).ToTypeString()}), was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsNotInRangeFor{T}(int,T[],string)"/> (or an overload) fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor<T>(int index, <#=item.Type#> <#=item.Name#>, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must not be in the range given by <0> and {AssertString(<#=item.Name#>.<#=item.Size#>)} to be an invalid index for the target collection ({typeof(<#=item.Type#>).ToTypeString()}), was {AssertString(index)}");
-            }
-<#
-});
-#>
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Diagnostics/Generated/TypeInfo.ttinclude b/Microsoft.Toolkit.Diagnostics/Generated/TypeInfo.ttinclude
deleted file mode 100644
index b2421dc2a19..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Generated/TypeInfo.ttinclude
+++ /dev/null
@@ -1,116 +0,0 @@
-<#@ template language="C#"#>
-<#@ assembly name="System.Core" #>
-<#@ import namespace="System.Collections.Generic" #>
-<#@ output extension=".g.cs"#>
-// =====================
-// Auto generated file
-// =====================
-<#+
-    /// <summary>
-    /// A model representing the info on an enumerable type
-    /// </summary>
-    sealed class EnumerableTypeInfo
-    {
-        public EnumerableTypeInfo(
-            string type,
-            string xmlType,
-            string name,
-            string size,
-            string destinationType,
-            string cast)
-        {
-            Type = type;
-            XmlType = xmlType;
-            Name = name;
-            Size = size;
-            DestinationType = destinationType;
-            Cast = cast;
-        }
-
-        /// <summary>
-        /// Gets the name of the current type
-        /// </summary>
-        public string Type { get; }
-
-        /// <summary>
-        /// Gets the XML-formatted name of the current type (eg. with {T} instead of &lt;T>)
-        /// </summary>
-        public string XmlType { get; }
-
-        /// <summary>
-        /// Gets the variable name to use
-        /// </summary>
-        public string Name { get; }
-
-        /// <summary>
-        /// Gets the name of the property to use to retrieve the length of the current type
-        /// </summary>
-        public string Size { get; }
-
-        /// <summary>
-        /// Gets whether or not the current type has a "Count" property
-        /// </summary>
-        public bool HasCountProperty => Size == "Count";
-
-        /// <summary>
-        /// Gets the name of the destination type, when comparing counts across different collections
-        /// </summary>
-        public string DestinationType { get; }
-
-        /// <summary>
-        /// Gets the (optional) casting to resolve the diamond problem between different interfaces
-        /// </summary>
-        public string Cast { get; }
-    }
-
-    /// <summary>
-    /// Gets the list of available enumerable types to generate APIs for
-    /// </summary>
-    static readonly IReadOnlyList<EnumerableTypeInfo> EnumerableTypes = new[]
-    {
-        new EnumerableTypeInfo("Span<T>", "<see cref=\"Span{T}\"/>", "span", "Length", "Span<T>", ""),
-        new EnumerableTypeInfo("ReadOnlySpan<T>", "<see cref=\"ReadOnlySpan{T}\"/>", "span", "Length", "Span<T>", ""),
-        new EnumerableTypeInfo("Memory<T>", "<see cref=\"Memory{T}\"/>", "memory", "Length", "Memory<T>", ""),
-        new EnumerableTypeInfo("ReadOnlyMemory<T>", "<see cref=\"ReadOnlyMemory{T}\"/>", "memory", "Length", "Memory<T>", ""),
-        new EnumerableTypeInfo("T[]", "<see typeparamref=\"T\"/> array", "array", "Length", "T[]", ""),
-        new EnumerableTypeInfo("List<T>", "<see cref=\"List{T}\"/>", "list", "Count", "List<T>", "(ICollection<T>)"),
-        new EnumerableTypeInfo("ICollection<T>", "<see cref=\"ICollection{T}\"/>", "collection", "Count", "ICollection<T>", ""),
-        new EnumerableTypeInfo("IReadOnlyCollection<T>", "<see cref=\"IReadOnlyCollection{T}\"/>", "collection", "Count", "ICollection<T>", ""),
-    };
-
-    /// <summary>
-    /// Gets the list of available numeric types to generate APIs for
-    /// </summary>
-    static readonly IReadOnlyList<(string Name, string Prefix)> NumericTypes = new[]
-    {
-        ("byte", "cref"),
-        ("sbyte", "cref"),
-        ("short", "cref"),
-        ("ushort", "cref"),
-        ("char", "cref"),
-        ("int", "cref"),
-        ("uint", "cref"),
-        ("float", "cref"),
-        ("long", "cref"),
-        ("ulong", "cref"),
-        ("double", "cref"),
-        ("decimal", "cref"),
-        ("nint", "langword"),
-        ("nuint", "langword")
-    };
-
-    /// <summary>
-    /// Generates text for a given sequence of items, automatically adding the necessary spacing
-    /// </summary>
-    void GenerateTextForItems<T>(IReadOnlyList<T> items, Action<T> factory)
-    {
-        for (int i = 0; i < items.Count; i++)
-        {
-            // Insert a blank line after the first item
-            if (i > 0) WriteLine("");
-
-            // Invoke the factory with the current item
-            factory(items [i]);
-        }
-    }
-#>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Guard.Comparable.Generic.cs b/Microsoft.Toolkit.Diagnostics/Guard.Comparable.Generic.cs
deleted file mode 100644
index 6b68e27ef2b..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Guard.Comparable.Generic.cs
+++ /dev/null
@@ -1,445 +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;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Asserts that the input value is <see langword="default"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of <see langword="struct"/> value type being tested.</typeparam>
-        /// <param name="value">The input value to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is not <see langword="default"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsDefault<T>(T value, string name)
-            where T : struct, IEquatable<T>
-        {
-            if (value.Equals(default))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsDefault(value, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value is not <see langword="default"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of <see langword="struct"/> value type being tested.</typeparam>
-        /// <param name="value">The input value to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is <see langword="default"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotDefault<T>(T value, string name)
-            where T : struct, IEquatable<T>
-        {
-            if (!value.Equals(default))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotDefault<T>(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="target">The target <typeparamref name="T"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is != <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEqualTo<T>(T value, T target, string name)
-            where T : notnull, IEquatable<T>
-        {
-            if (value.Equals(target))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be not equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="target">The target <typeparamref name="T"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is == <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEqualTo<T>(T value, T target, string name)
-            where T : notnull, IEquatable<T>
-        {
-            if (!value.Equals(target))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEqualTo(value, target, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be a bitwise match with a specified value.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="target">The target <typeparamref name="T"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is not a bitwise match for <paramref name="target"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe void IsBitwiseEqualTo<T>(T value, T target, string name)
-            where T : unmanaged
-        {
-            // Include some fast paths if the input type is of size 1, 2, 4, 8, or 16.
-            // In those cases, just reinterpret the bytes as values of an integer type,
-            // and compare them directly, which is much faster than having a loop over each byte.
-            // The conditional branches below are known at compile time by the JIT compiler,
-            // so that only the right one will actually be translated into native code.
-            if (sizeof(T) == 1)
-            {
-                byte valueByte = Unsafe.As<T, byte>(ref value);
-                byte targetByte = Unsafe.As<T, byte>(ref target);
-
-                if (valueByte == targetByte)
-                {
-                    return;
-                }
-
-                ThrowHelper.ThrowArgumentExceptionForBitwiseEqualTo(value, target, name);
-            }
-            else if (sizeof(T) == 2)
-            {
-                ushort valueUShort = Unsafe.As<T, ushort>(ref value);
-                ushort targetUShort = Unsafe.As<T, ushort>(ref target);
-
-                if (valueUShort == targetUShort)
-                {
-                    return;
-                }
-
-                ThrowHelper.ThrowArgumentExceptionForBitwiseEqualTo(value, target, name);
-            }
-            else if (sizeof(T) == 4)
-            {
-                uint valueUInt = Unsafe.As<T, uint>(ref value);
-                uint targetUInt = Unsafe.As<T, uint>(ref target);
-
-                if (valueUInt == targetUInt)
-                {
-                    return;
-                }
-
-                ThrowHelper.ThrowArgumentExceptionForBitwiseEqualTo(value, target, name);
-            }
-            else if (sizeof(T) == 8)
-            {
-                ulong valueULong = Unsafe.As<T, ulong>(ref value);
-                ulong targetULong = Unsafe.As<T, ulong>(ref target);
-
-                if (Bit64Compare(ref valueULong, ref targetULong))
-                {
-                    return;
-                }
-
-                ThrowHelper.ThrowArgumentExceptionForBitwiseEqualTo(value, target, name);
-            }
-            else if (sizeof(T) == 16)
-            {
-                ulong valueULong0 = Unsafe.As<T, ulong>(ref value);
-                ulong targetULong0 = Unsafe.As<T, ulong>(ref target);
-
-                if (Bit64Compare(ref valueULong0, ref targetULong0))
-                {
-                    ulong valueULong1 = Unsafe.Add(ref Unsafe.As<T, ulong>(ref value), 1);
-                    ulong targetULong1 = Unsafe.Add(ref Unsafe.As<T, ulong>(ref target), 1);
-
-                    if (Bit64Compare(ref valueULong1, ref targetULong1))
-                    {
-                        return;
-                    }
-                }
-
-                ThrowHelper.ThrowArgumentExceptionForBitwiseEqualTo(value, target, name);
-            }
-            else
-            {
-                Span<byte> valueBytes = new Span<byte>(Unsafe.AsPointer(ref value), sizeof(T));
-                Span<byte> targetBytes = new Span<byte>(Unsafe.AsPointer(ref target), sizeof(T));
-
-                if (valueBytes.SequenceEqual(targetBytes))
-                {
-                    return;
-                }
-
-                ThrowHelper.ThrowArgumentExceptionForBitwiseEqualTo(value, target, name);
-            }
-        }
-
-        // Compares 64 bits of data from two given memory locations for bitwise equality
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static unsafe bool Bit64Compare(ref ulong left, ref ulong right)
-        {
-            // Handles 32 bit case, because using ulong is inefficient
-            if (sizeof(IntPtr) == 4)
-            {
-                ref int r0 = ref Unsafe.As<ulong, int>(ref left);
-                ref int r1 = ref Unsafe.As<ulong, int>(ref right);
-
-                return r0 == r1 &&
-                       Unsafe.Add(ref r0, 1) == Unsafe.Add(ref r1, 1);
-            }
-
-            return left == right;
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than a specified value.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="maximum">The exclusive maximum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThan<T>(T value, T maximum, string name)
-            where T : notnull, IComparable<T>
-        {
-            if (value.CompareTo(maximum) < 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThan(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be less than or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="maximum">The inclusive maximum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="maximum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsLessThanOrEqualTo<T>(T value, T maximum, string name)
-            where T : notnull, IComparable<T>
-        {
-            if (value.CompareTo(maximum) <= 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo(value, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than a specified value.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThan<T>(T value, T minimum, string name)
-            where T : notnull, IComparable<T>
-        {
-            if (value.CompareTo(minimum) > 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThan(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be greater than or equal to a specified value.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsGreaterThanOrEqualTo<T>(T value, T minimum, string name)
-            where T : notnull, IComparable<T>
-        {
-            if (value.CompareTo(minimum) >= 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo(value, minimum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given range.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRange<T>(T value, T minimum, T maximum, string name)
-            where T : notnull, IComparable<T>
-        {
-            if (value.CompareTo(minimum) >= 0 && value.CompareTo(maximum) < 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given range.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRange<T>(T value, T minimum, T maximum, string name)
-            where T : notnull, IComparable<T>
-        {
-            if (value.CompareTo(minimum) < 0 || value.CompareTo(maximum) >= 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRange(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt;= <paramref name="minimum"/> or >= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetween<T>(T value, T minimum, T maximum, string name)
-            where T : notnull, IComparable<T>
-        {
-            if (value.CompareTo(minimum) > 0 && value.CompareTo(maximum) < 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="minimum">The exclusive minimum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="maximum">The exclusive maximum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is > <paramref name="minimum"/> or &lt; <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in (<paramref name="minimum"/>, <paramref name="maximum"/>)", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetween<T>(T value, T minimum, T maximum, string name)
-            where T : notnull, IComparable<T>
-        {
-            if (value.CompareTo(minimum) <= 0 || value.CompareTo(maximum) >= 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetween(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be in a given interval.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is &lt; <paramref name="minimum"/> or > <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
-            where T : notnull, IComparable<T>
-        {
-            if (value.CompareTo(minimum) >= 0 && value.CompareTo(maximum) <= 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be in a given interval.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="minimum">The inclusive minimum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="maximum">The inclusive maximum <typeparamref name="T"/> value that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> is >= <paramref name="minimum"/> or &lt;= <paramref name="maximum"/>.</exception>
-        /// <remarks>
-        /// This API asserts the equivalent of "<paramref name="value"/> not in [<paramref name="minimum"/>, <paramref name="maximum"/>]", using arithmetic notation.
-        /// The method is generic to avoid boxing the parameters, if they are value types.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
-            where T : notnull, IComparable<T>
-        {
-            if (value.CompareTo(minimum) < 0 || value.CompareTo(maximum) > 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo(value, minimum, maximum, name);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Guard.Comparable.Numeric.cs b/Microsoft.Toolkit.Diagnostics/Guard.Comparable.Numeric.cs
deleted file mode 100644
index 2403a884d2e..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Guard.Comparable.Numeric.cs
+++ /dev/null
@@ -1,271 +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.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Asserts that the input value must be within a given distance from a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="target">The target <see cref="int"/> value to test for.</param>
-        /// <param name="delta">The maximum distance to allow between <paramref name="value"/> and <paramref name="target"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if (<paramref name="value"/> - <paramref name="target"/>) > <paramref name="delta"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsCloseTo(int value, int target, uint delta, string name)
-        {
-            uint difference;
-
-            if (value >= target)
-            {
-                difference = (uint)(value - target);
-            }
-            else
-            {
-                difference = (uint)(target - value);
-            }
-
-            if (difference <= delta)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsCloseTo(value, target, delta, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be within a given distance from a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="int"/> value to test.</param>
-        /// <param name="target">The target <see cref="int"/> value to test for.</param>
-        /// <param name="delta">The maximum distance to allow between <paramref name="value"/> and <paramref name="target"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if (<paramref name="value"/> - <paramref name="target"/>) &lt;= <paramref name="delta"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotCloseTo(int value, int target, uint delta, string name)
-        {
-            uint difference;
-
-            if (value >= target)
-            {
-                difference = (uint)(value - target);
-            }
-            else
-            {
-                difference = (uint)(target - value);
-            }
-
-            if (difference > delta)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotCloseTo(value, target, delta, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be within a given distance from a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="target">The target <see cref="long"/> value to test for.</param>
-        /// <param name="delta">The maximum distance to allow between <paramref name="value"/> and <paramref name="target"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if (<paramref name="value"/> - <paramref name="target"/>) > <paramref name="delta"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsCloseTo(long value, long target, ulong delta, string name)
-        {
-            ulong difference;
-
-            if (value >= target)
-            {
-                difference = (ulong)(value - target);
-            }
-            else
-            {
-                difference = (ulong)(target - value);
-            }
-
-            if (difference <= delta)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsCloseTo(value, target, delta, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be within a given distance from a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="long"/> value to test.</param>
-        /// <param name="target">The target <see cref="long"/> value to test for.</param>
-        /// <param name="delta">The maximum distance to allow between <paramref name="value"/> and <paramref name="target"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if (<paramref name="value"/> - <paramref name="target"/>) &lt;= <paramref name="delta"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotCloseTo(long value, long target, ulong delta, string name)
-        {
-            ulong difference;
-
-            if (value >= target)
-            {
-                difference = (ulong)(value - target);
-            }
-            else
-            {
-                difference = (ulong)(target - value);
-            }
-
-            if (difference > delta)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotCloseTo(value, target, delta, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be within a given distance from a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="target">The target <see cref="float"/> value to test for.</param>
-        /// <param name="delta">The maximum distance to allow between <paramref name="value"/> and <paramref name="target"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if (<paramref name="value"/> - <paramref name="target"/>) > <paramref name="delta"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsCloseTo(float value, float target, float delta, string name)
-        {
-            if (Math.Abs(value - target) <= delta)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsCloseTo(value, target, delta, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be within a given distance from a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="float"/> value to test.</param>
-        /// <param name="target">The target <see cref="float"/> value to test for.</param>
-        /// <param name="delta">The maximum distance to allow between <paramref name="value"/> and <paramref name="target"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if (<paramref name="value"/> - <paramref name="target"/>) &lt;= <paramref name="delta"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotCloseTo(float value, float target, float delta, string name)
-        {
-            if (Math.Abs(value - target) > delta)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotCloseTo(value, target, delta, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be within a given distance from a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="target">The target <see cref="double"/> value to test for.</param>
-        /// <param name="delta">The maximum distance to allow between <paramref name="value"/> and <paramref name="target"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if (<paramref name="value"/> - <paramref name="target"/>) > <paramref name="delta"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsCloseTo(double value, double target, double delta, string name)
-        {
-            if (Math.Abs(value - target) <= delta)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsCloseTo(value, target, delta, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be within a given distance from a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="double"/> value to test.</param>
-        /// <param name="target">The target <see cref="double"/> value to test for.</param>
-        /// <param name="delta">The maximum distance to allow between <paramref name="value"/> and <paramref name="target"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if (<paramref name="value"/> - <paramref name="target"/>) &lt;= <paramref name="delta"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotCloseTo(double value, double target, double delta, string name)
-        {
-            if (Math.Abs(value - target) > delta)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotCloseTo(value, target, delta, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be within a given distance from a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="target">The target <see langword="nint"/> value to test for.</param>
-        /// <param name="delta">The maximum distance to allow between <paramref name="value"/> and <paramref name="target"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if (<paramref name="value"/> - <paramref name="target"/>) > <paramref name="delta"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsCloseTo(nint value, nint target, nuint delta, string name)
-        {
-            nuint difference;
-
-            if (value >= target)
-            {
-                difference = (nuint)(value - target);
-            }
-            else
-            {
-                difference = (nuint)(target - value);
-            }
-
-            if (difference <= delta)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsCloseTo(value, target, delta, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be within a given distance from a specified value.
-        /// </summary>
-        /// <param name="value">The input <see langword="nint"/> value to test.</param>
-        /// <param name="target">The target <see langword="nint"/> value to test for.</param>
-        /// <param name="delta">The maximum distance to allow between <paramref name="value"/> and <paramref name="target"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if (<paramref name="value"/> - <paramref name="target"/>) &lt;= <paramref name="delta"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotCloseTo(nint value, nint target, nuint delta, string name)
-        {
-            nuint difference;
-
-            if (value >= target)
-            {
-                difference = (nuint)(value - target);
-            }
-            else
-            {
-                difference = (nuint)(target - value);
-            }
-
-            if (difference > delta)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotCloseTo(value, target, delta, name);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Guard.IO.cs b/Microsoft.Toolkit.Diagnostics/Guard.IO.cs
deleted file mode 100644
index d97d4e83a71..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Guard.IO.cs
+++ /dev/null
@@ -1,84 +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.IO;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Asserts that the input <see cref="Stream"/> instance must support reading.
-        /// </summary>
-        /// <param name="stream">The input <see cref="Stream"/> instance to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="stream"/> doesn't support reading.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void CanRead(Stream stream, string name)
-        {
-            if (stream.CanRead)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForCanRead(stream, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Stream"/> instance must support writing.
-        /// </summary>
-        /// <param name="stream">The input <see cref="Stream"/> instance to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="stream"/> doesn't support writing.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void CanWrite(Stream stream, string name)
-        {
-            if (stream.CanWrite)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForCanWrite(stream, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Stream"/> instance must support seeking.
-        /// </summary>
-        /// <param name="stream">The input <see cref="Stream"/> instance to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="stream"/> doesn't support seeking.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void CanSeek(Stream stream, string name)
-        {
-            if (stream.CanSeek)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForCanSeek(stream, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Stream"/> instance must be at the starting position.
-        /// </summary>
-        /// <param name="stream">The input <see cref="Stream"/> instance to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="stream"/> is not at the starting position.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsAtStartPosition(Stream stream, string name)
-        {
-            if (stream.Position == 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsAtStartPosition(stream, name);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Guard.String.cs b/Microsoft.Toolkit.Diagnostics/Guard.String.cs
deleted file mode 100644
index e80510e3a60..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Guard.String.cs
+++ /dev/null
@@ -1,410 +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.CodeAnalysis;
-using System.Runtime.CompilerServices;
-
-#pragma warning disable CS8777
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Asserts that the input <see cref="string"/> instance must be <see langword="null"/> or empty.
-        /// </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 empty.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNullOrEmpty(string? text, string name)
-        {
-            if (string.IsNullOrEmpty(text))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNullOrEmpty(text, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="string"/> instance must not be <see langword="null"/> or empty.
-        /// </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="ArgumentNullException">Thrown if <paramref name="text"/> is <see langword="null"/>.</exception>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="text"/> is empty.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotNullOrEmpty([NotNull] string? text, string name)
-        {
-            if (!string.IsNullOrEmpty(text))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotNullOrEmpty(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)]
-        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))
-            {
-                return;
-            }
-
-            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="ArgumentNullException">Thrown if <paramref name="text"/> is <see langword="null"/>.</exception>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="text"/> is whitespace.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotNullOrWhiteSpace([NotNull] string? text, string name)
-        {
-            if (!string.IsNullOrWhiteSpace(text))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotNullOrWhiteSpace(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)]
-        [Obsolete("Use " + nameof(IsNotNullOrWhiteSpace))]
-        public static void IsNotNullOrWhitespace([NotNull] string? text, string name)
-        {
-            if (!string.IsNullOrWhiteSpace(text))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotNullOrWhiteSpace(text, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="string"/> instance must be empty.
-        /// </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 empty.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsEmpty(string text, string name)
-        {
-            if (text.Length == 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsEmpty(text, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="string"/> instance must not be empty.
-        /// </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 empty.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotEmpty(string text, string name)
-        {
-            if (text.Length != 0)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotEmpty(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)]
-        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))
-            {
-                return;
-            }
-
-            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>
-        /// 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)]
-        [Obsolete("Use " + nameof(IsNotWhiteSpace))]
-        public static void IsNotWhitespace(string text, string name)
-        {
-            if (!string.IsNullOrWhiteSpace(text))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotWhiteSpace(text, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="string"/> instance must have a size of a specified value.
-        /// </summary>
-        /// <param name="text">The input <see cref="string"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="text"/> is != <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo(string text, int size, string name)
-        {
-            if (text.Length == size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(text, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="string"/> instance must have a size not equal to a specified value.
-        /// </summary>
-        /// <param name="text">The input <see cref="string"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="text"/> is == <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeNotEqualTo(string text, int size, string name)
-        {
-            if (text.Length != size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeNotEqualTo(text, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="string"/> instance must have a size over a specified value.
-        /// </summary>
-        /// <param name="text">The input <see cref="string"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="text"/> is &lt;= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThan(string text, int size, string name)
-        {
-            if (text.Length > size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThan(text, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="string"/> instance must have a size of at least specified value.
-        /// </summary>
-        /// <param name="text">The input <see cref="string"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="text"/> is &lt; <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeGreaterThanOrEqualTo(string text, int size, string name)
-        {
-            if (text.Length >= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(text, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="string"/> instance must have a size of less than a specified value.
-        /// </summary>
-        /// <param name="text">The input <see cref="string"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="text"/> is >= <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThan(string text, int size, string name)
-        {
-            if (text.Length < size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThan(text, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="string"/> instance must have a size of less than or equal to a specified value.
-        /// </summary>
-        /// <param name="text">The input <see cref="string"/> instance to check the size for.</param>
-        /// <param name="size">The target size to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="text"/> is > <paramref name="size"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo(string text, int size, string name)
-        {
-            if (text.Length <= size)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(text, size, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="string"/> instance must have the same size of a destination <see cref="string"/> instance.
-        /// </summary>
-        /// <param name="source">The source <see cref="string"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="string"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is != the one of <paramref name="destination"/>.</exception>
-        /// <remarks>The <see cref="string"/> type is immutable, but the name of this API is kept for consistency with the other overloads.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeEqualTo(string source, string destination, string name)
-        {
-            if (source.Length == destination.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeEqualTo(source, destination, name);
-        }
-
-        /// <summary>
-        /// Asserts that the source <see cref="string"/> instance must have a size of less than or equal to that of a destination <see cref="string"/> instance.
-        /// </summary>
-        /// <param name="source">The source <see cref="string"/> instance to check the size for.</param>
-        /// <param name="destination">The destination <see cref="string"/> instance to check the size for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the size of <paramref name="source"/> is > the one of <paramref name="destination"/>.</exception>
-        /// <remarks>The <see cref="string"/> type is immutable, but the name of this API is kept for consistency with the other overloads.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasSizeLessThanOrEqualTo(string source, string destination, string name)
-        {
-            if (source.Length <= destination.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(source, destination, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is valid for a given <see cref="string"/> instance.
-        /// </summary>
-        /// <param name="index">The input index to be used to access <paramref name="text"/>.</param>
-        /// <param name="text">The input <see cref="string"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is not valid to access <paramref name="text"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsInRangeFor(int index, string text, string name)
-        {
-            if ((uint)index < (uint)text.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsInRangeFor(index, text, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input index is not valid for a given <see cref="string"/> instance.
-        /// </summary>
-        /// <param name="index">The input index to be used to access <paramref name="text"/>.</param>
-        /// <param name="text">The input <see cref="string"/> instance to use to validate <paramref name="index"/>.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="index"/> is valid to access <paramref name="text"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotInRangeFor(int index, string text, string name)
-        {
-            if ((uint)index >= (uint)text.Length)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(index, text, name);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Guard.Tasks.cs b/Microsoft.Toolkit.Diagnostics/Guard.Tasks.cs
deleted file mode 100644
index f2733865c37..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Guard.Tasks.cs
+++ /dev/null
@@ -1,188 +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 System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Asserts that the input <see cref="Task"/> instance is in a completed state.
-        /// </summary>
-        /// <param name="task">The input <see cref="Task"/> instance to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="task"/> is not in a completed state.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsCompleted(Task task, string name)
-        {
-            if (task.IsCompleted)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsCompleted(task, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Task"/> instance is not in a completed state.
-        /// </summary>
-        /// <param name="task">The input <see cref="Task"/> instance to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="task"/> is in a completed state.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotCompleted(Task task, string name)
-        {
-            if (!task.IsCompleted)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotCompleted(task, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Task"/> instance has been completed successfully.
-        /// </summary>
-        /// <param name="task">The input <see cref="Task"/> instance to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="task"/> has not been completed successfully.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsCompletedSuccessfully(Task task, string name)
-        {
-            if (task.Status == TaskStatus.RanToCompletion)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsCompletedSuccessfully(task, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Task"/> instance has not been completed successfully.
-        /// </summary>
-        /// <param name="task">The input <see cref="Task"/> instance to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="task"/> has been completed successfully.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotCompletedSuccessfully(Task task, string name)
-        {
-            if (task.Status != TaskStatus.RanToCompletion)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotCompletedSuccessfully(task, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Task"/> instance is faulted.
-        /// </summary>
-        /// <param name="task">The input <see cref="Task"/> instance to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="task"/> is not faulted.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsFaulted(Task task, string name)
-        {
-            if (task.IsFaulted)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsFaulted(task, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Task"/> instance is not faulted.
-        /// </summary>
-        /// <param name="task">The input <see cref="Task"/> instance to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="task"/> is faulted.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotFaulted(Task task, string name)
-        {
-            if (!task.IsFaulted)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotFaulted(task, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Task"/> instance is canceled.
-        /// </summary>
-        /// <param name="task">The input <see cref="Task"/> instance to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="task"/> is not canceled.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsCanceled(Task task, string name)
-        {
-            if (task.IsCanceled)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsCanceled(task, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Task"/> instance is not canceled.
-        /// </summary>
-        /// <param name="task">The input <see cref="Task"/> instance to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="task"/> is canceled.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotCanceled(Task task, string name)
-        {
-            if (!task.IsCanceled)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotCanceled(task, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Task"/> instance has a specific status.
-        /// </summary>
-        /// <param name="task">The input <see cref="Task"/> instance to test.</param>
-        /// <param name="status">The task status that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="task"/> doesn't match <paramref name="status"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasStatusEqualTo(Task task, TaskStatus status, string name)
-        {
-            if (task.Status == status)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasStatusEqualTo(task, status, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input <see cref="Task"/> instance has not a specific status.
-        /// </summary>
-        /// <param name="task">The input <see cref="Task"/> instance to test.</param>
-        /// <param name="status">The task status that is accepted.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="task"/> matches <paramref name="status"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void HasStatusNotEqualTo(Task task, TaskStatus status, string name)
-        {
-            if (task.Status != status)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForHasStatusNotEqualTo(task, status, name);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Guard.cs b/Microsoft.Toolkit.Diagnostics/Guard.cs
deleted file mode 100644
index 73f173d6477..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Guard.cs
+++ /dev/null
@@ -1,352 +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;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    [DebuggerStepThrough]
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Asserts that the input value is <see langword="null"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of reference value type being tested.</typeparam>
-        /// <param name="value">The input value to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is not <see langword="null"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNull<T>(T? value, string name)
-            where T : class
-        {
-            if (value is null)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNull(value, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value is <see langword="null"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of nullable value type being tested.</typeparam>
-        /// <param name="value">The input value to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is not <see langword="null"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNull<T>(T? value, string name)
-            where T : struct
-        {
-            if (value is null)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNull(value, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value is not <see langword="null"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of reference value type being tested.</typeparam>
-        /// <param name="value">The input value to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentNullException">Thrown if <paramref name="value"/> is <see langword="null"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotNull<T>([NotNull] T? value, string name)
-            where T : class
-        {
-            if (value is not null)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentNullExceptionForIsNotNull<T>(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value is not <see langword="null"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of nullable value type being tested.</typeparam>
-        /// <param name="value">The input value to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentNullException">Thrown if <paramref name="value"/> is <see langword="null"/>.</exception>
-        /// <remarks>The method is generic to avoid boxing the parameters, if they are value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotNull<T>([NotNull] T? value, string name)
-            where T : struct
-        {
-            if (value is not null)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentNullExceptionForIsNotNull<T?>(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value is of a specific type.
-        /// </summary>
-        /// <typeparam name="T">The type of the input value.</typeparam>
-        /// <param name="value">The input <see cref="object"/> to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is not of type <typeparamref name="T"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsOfType<T>(object value, string name)
-        {
-            if (value.GetType() == typeof(T))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsOfType<T>(value, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value is not of a specific type.
-        /// </summary>
-        /// <typeparam name="T">The type of the input value.</typeparam>
-        /// <param name="value">The input <see cref="object"/> to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is of type <typeparamref name="T"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotOfType<T>(object value, string name)
-        {
-            if (value.GetType() != typeof(T))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotOfType<T>(value, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value is of a specific type.
-        /// </summary>
-        /// <param name="value">The input <see cref="object"/> to test.</param>
-        /// <param name="type">The type to look for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the type of <paramref name="value"/> is not the same as <paramref name="type"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsOfType(object value, Type type, string name)
-        {
-            if (value.GetType() == type)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsOfType(value, type, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value is not of a specific type.
-        /// </summary>
-        /// <param name="value">The input <see cref="object"/> to test.</param>
-        /// <param name="type">The type to look for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if the type of <paramref name="value"/> is the same as <paramref name="type"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotOfType(object value, Type type, string name)
-        {
-            if (value.GetType() != type)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotOfType(value, type, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value can be assigned to a specified type.
-        /// </summary>
-        /// <typeparam name="T">The type to check the input value against.</typeparam>
-        /// <param name="value">The input <see cref="object"/> to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> can't be assigned to type <typeparamref name="T"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsAssignableToType<T>(object value, string name)
-        {
-            if (value is T)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsAssignableToType<T>(value, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value can't be assigned to a specified type.
-        /// </summary>
-        /// <typeparam name="T">The type to check the input value against.</typeparam>
-        /// <param name="value">The input <see cref="object"/> to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> can be assigned to type <typeparamref name="T"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotAssignableToType<T>(object value, string name)
-        {
-            if (value is not T)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotAssignableToType<T>(value, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value can be assigned to a specified type.
-        /// </summary>
-        /// <param name="value">The input <see cref="object"/> to test.</param>
-        /// <param name="type">The type to look for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> can't be assigned to <paramref name="type"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsAssignableToType(object value, Type type, string name)
-        {
-            if (type.IsInstanceOfType(value))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsAssignableToType(value, type, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value can't be assigned to a specified type.
-        /// </summary>
-        /// <param name="value">The input <see cref="object"/> to test.</param>
-        /// <param name="type">The type to look for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> can be assigned to <paramref name="type"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsNotAssignableToType(object value, Type type, string name)
-        {
-            if (!type.IsInstanceOfType(value))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsNotAssignableToType(value, type, name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be the same instance as the target value.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="target">The target <typeparamref name="T"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is not the same instance as <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to prevent using it with value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsReferenceEqualTo<T>(T value, T target, string name)
-            where T : class
-        {
-            if (ReferenceEquals(value, target))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsReferenceEqualTo<T>(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must not be the same instance as the target value.
-        /// </summary>
-        /// <typeparam name="T">The type of input values to compare.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to test.</param>
-        /// <param name="target">The target <typeparamref name="T"/> value to test for.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is the same instance as <paramref name="target"/>.</exception>
-        /// <remarks>The method is generic to prevent using it with value types.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsReferenceNotEqualTo<T>(T value, T target, string name)
-            where T : class
-        {
-            if (!ReferenceEquals(value, target))
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsReferenceNotEqualTo<T>(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be <see langword="true"/>.
-        /// </summary>
-        /// <param name="value">The input <see cref="bool"/> to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is <see langword="false"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsTrue([DoesNotReturnIf(false)] bool value, string name)
-        {
-            if (value)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsTrue(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be <see langword="true"/>.
-        /// </summary>
-        /// <param name="value">The input <see cref="bool"/> to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <param name="message">A message to display if <paramref name="value"/> is <see langword="false"/>.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is <see langword="false"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsTrue([DoesNotReturnIf(false)] bool value, string name, string message)
-        {
-            if (value)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsTrue(name, message);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be <see langword="false"/>.
-        /// </summary>
-        /// <param name="value">The input <see cref="bool"/> to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is <see langword="true"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsFalse([DoesNotReturnIf(true)] bool value, string name)
-        {
-            if (!value)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsFalse(name);
-        }
-
-        /// <summary>
-        /// Asserts that the input value must be <see langword="false"/>.
-        /// </summary>
-        /// <param name="value">The input <see cref="bool"/> to test.</param>
-        /// <param name="name">The name of the input parameter being tested.</param>
-        /// <param name="message">A message to display if <paramref name="value"/> is <see langword="true"/>.</param>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="value"/> is <see langword="true"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void IsFalse([DoesNotReturnIf(true)] bool value, string name, string message)
-        {
-            if (!value)
-            {
-                return;
-            }
-
-            ThrowHelper.ThrowArgumentExceptionForIsFalse(name, message);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Collection.Generic.ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/Internals/Guard.Collection.Generic.ThrowHelper.cs
deleted file mode 100644
index 8fa5684911d..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Collection.Generic.ThrowHelper.cs
+++ /dev/null
@@ -1,53 +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.CodeAnalysis;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Helper methods to efficiently throw exceptions.
-        /// </summary>
-        private static partial class ThrowHelper
-        {
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotEmpty{T}(Span{T},string)"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The item of items in the input <see cref="Span{T}"/> instance.</typeparam>
-            /// <remarks>This method is needed because <see cref="Span{T}"/> can't be used as a generic type parameter.</remarks>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotEmptyWithSpan<T>(string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(Span<T>).ToTypeString()}) must not be empty", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotEmpty{T}(ReadOnlySpan{T},string)"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The item of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-            /// <remarks>This method is needed because <see cref="ReadOnlySpan{T}"/> can't be used as a generic type parameter.</remarks>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotEmptyWithReadOnlySpan<T>(string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(ReadOnlySpan<T>).ToTypeString()}) must not be empty", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotEmpty{T}(T[],string)"/> (or an overload) fails.
-            /// </summary>
-            /// <typeparam name="T">The item of items in the input collection.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotEmpty<T>(string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must not be empty", name);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Generic.ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Generic.ThrowHelper.cs
deleted file mode 100644
index 00b6478b3a2..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Generic.ThrowHelper.cs
+++ /dev/null
@@ -1,174 +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.CodeAnalysis;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Helper methods to efficiently throw exceptions.
-        /// </summary>
-        private static partial class ThrowHelper
-        {
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsDefault{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of <see langword="struct"/> value type being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsDefault<T>(T value, string name)
-                where T : struct
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must be the default value {AssertString(default(T))}, was {AssertString(value)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotDefault{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of <see langword="struct"/> value type being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotDefault<T>(string name)
-                where T : struct
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must not be the default value {AssertString(default(T))}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsEqualTo{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of values being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsEqualTo<T>(T value, T target, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must be equal to {AssertString(target)}, was {AssertString(value)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotEqualTo{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of values being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotEqualTo<T>(T value, T target, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must not be equal to {AssertString(target)}, was {AssertString(value)}", name);
-            }
-
-            /// <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>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForBitwiseEqualTo<T>(T value, T target, string name)
-                where T : unmanaged
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) is not a bitwise match, was <{value.ToHexString()}> instead of <{target.ToHexString()}>", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsLessThan{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of values being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsLessThan<T>(T value, T maximum, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, value!, $"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must be less than {AssertString(maximum)}, was {AssertString(value)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsLessThanOrEqualTo{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of values being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsLessThanOrEqualTo<T>(T value, T maximum, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, value!, $"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must be less than or equal to {AssertString(maximum)}, was {AssertString(value)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsGreaterThan{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of values being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsGreaterThan<T>(T value, T minimum, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, value!, $"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must be greater than {AssertString(minimum)}, was {AssertString(value)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsGreaterThanOrEqualTo{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of values being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsGreaterThanOrEqualTo<T>(T value, T minimum, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, value!, $"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must be greater than or equal to {AssertString(minimum)}, was {AssertString(value)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsInRange{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of values being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsInRange<T>(T value, T minimum, T maximum, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, value!, $"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must be in the range given by {AssertString(minimum)} and {AssertString(maximum)}, was {AssertString(value)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsInRange{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of values being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsNotInRange<T>(T value, T minimum, T maximum, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, value!, $"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must not be in the range given by {AssertString(minimum)} and {AssertString(maximum)}, was {AssertString(value)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsBetween{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of values being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsBetween<T>(T value, T minimum, T maximum, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, value!, $"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must be between {AssertString(minimum)} and {AssertString(maximum)}, was {AssertString(value)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsNotBetween{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of values being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsNotBetween<T>(T value, T minimum, T maximum, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, value!, $"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must not be between {AssertString(minimum)} and {AssertString(maximum)}, was {AssertString(value)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsBetweenOrEqualTo{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of values being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, value!, $"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must be between or equal to {AssertString(minimum)} and {AssertString(maximum)}, was {AssertString(value)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsNotBetweenOrEqualTo{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of values being tested.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsNotBetweenOrEqualTo<T>(T value, T minimum, T maximum, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, value!, $"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must not be between or equal to {AssertString(minimum)} and {AssertString(maximum)}, was {AssertString(value)}");
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Numeric.ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Numeric.ThrowHelper.cs
deleted file mode 100644
index 795ff436a59..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Numeric.ThrowHelper.cs
+++ /dev/null
@@ -1,111 +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.CodeAnalysis;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Helper methods to efficiently throw exceptions.
-        /// </summary>
-        private static partial class ThrowHelper
-        {
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsCloseTo(int,int,uint,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsCloseTo(int value, int target, uint delta, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(int).ToTypeString()}) must be within a distance of {AssertString(delta)} from {AssertString(target)}, was {AssertString(value)} and had a distance of {AssertString(Math.Abs((double)((long)value - target)))}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotCloseTo(int,int,uint,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotCloseTo(int value, int target, uint delta, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(int).ToTypeString()}) must not be within a distance of {AssertString(delta)} from {AssertString(target)}, was {AssertString(value)} and had a distance of {AssertString(Math.Abs((double)((long)value - target)))}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsCloseTo(long,long,ulong,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsCloseTo(long value, long target, ulong delta, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(long).ToTypeString()}) must be within a distance of {AssertString(delta)} from {AssertString(target)}, was {AssertString(value)} and had a distance of {AssertString(Math.Abs((decimal)value - target))}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotCloseTo(long,long,ulong,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotCloseTo(long value, long target, ulong delta, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(long).ToTypeString()}) must not be within a distance of {AssertString(delta)} from {AssertString(target)}, was {AssertString(value)} and had a distance of {AssertString(Math.Abs((decimal)value - target))}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsCloseTo(float,float,float,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsCloseTo(float value, float target, float delta, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(float).ToTypeString()}) must be within a distance of {AssertString(delta)} from {AssertString(target)}, was {AssertString(value)} and had a distance of {AssertString(Math.Abs(value - target))}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotCloseTo(float,float,float,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotCloseTo(float value, float target, float delta, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(float).ToTypeString()}) must not be within a distance of {AssertString(delta)} from {AssertString(target)}, was {AssertString(value)} and had a distance of {AssertString(Math.Abs(value - target))}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsCloseTo(double,double,double,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsCloseTo(double value, double target, double delta, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(double).ToTypeString()}) must be within a distance of {AssertString(delta)} from {AssertString(target)}, was {AssertString(value)} and had a distance of {AssertString(Math.Abs(value - target))}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotCloseTo(double,double,double,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotCloseTo(double value, double target, double delta, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(double).ToTypeString()}) must not be within a distance of {AssertString(delta)} from {AssertString(target)}, was {AssertString(value)} and had a distance of {AssertString(Math.Abs(value - target))}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsCloseTo(nint,nint,nuint,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsCloseTo(nint value, nint target, nuint delta, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(nint).ToTypeString()}) must be within a distance of {AssertString(delta)} from {AssertString(target)}, was {AssertString(value)} and had a distance of {AssertString(Math.Abs(value - target))}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotCloseTo(nint,nint,nuint,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotCloseTo(nint value, nint target, nuint delta, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(nint).ToTypeString()}) must not be within a distance of {AssertString(delta)} from {AssertString(target)}, was {AssertString(value)} and had a distance of {AssertString(Math.Abs(value - target))}", name);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Internals/Guard.IO.ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/Internals/Guard.IO.ThrowHelper.cs
deleted file mode 100644
index a781ee8742a..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Internals/Guard.IO.ThrowHelper.cs
+++ /dev/null
@@ -1,58 +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.CodeAnalysis;
-using System.IO;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Helper methods to efficiently throw exceptions.
-        /// </summary>
-        private static partial class ThrowHelper
-        {
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.CanRead"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForCanRead(Stream stream, string name)
-            {
-                throw new ArgumentException($"Stream {AssertString(name)} ({stream.GetType().ToTypeString()}) doesn't support reading", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.CanWrite"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForCanWrite(Stream stream, string name)
-            {
-                throw new ArgumentException($"Stream {AssertString(name)} ({stream.GetType().ToTypeString()}) doesn't support writing", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.CanSeek"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForCanSeek(Stream stream, string name)
-            {
-                throw new ArgumentException($"Stream {AssertString(name)} ({stream.GetType().ToTypeString()}) doesn't support seeking", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsAtStartPosition"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsAtStartPosition(Stream stream, string name)
-            {
-                throw new ArgumentException($"Stream {AssertString(name)} ({stream.GetType().ToTypeString()}) must be at position {AssertString(0)}, was at {AssertString(stream.Position)}", name);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Internals/Guard.String.ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/Internals/Guard.String.ThrowHelper.cs
deleted file mode 100644
index 4af573d34f9..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Internals/Guard.String.ThrowHelper.cs
+++ /dev/null
@@ -1,206 +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.CodeAnalysis;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Helper methods to efficiently throw exceptions.
-        /// </summary>
-        private static partial class ThrowHelper
-        {
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNullOrEmpty"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNullOrEmpty(string? text, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} (string) must be null or empty, was {AssertString(text)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentNullException"/> or <see cref="ArgumentException"/> when <see cref="Guard.IsNotNullOrEmpty"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotNullOrEmpty(string? text, string name)
-            {
-                [MethodImpl(MethodImplOptions.NoInlining)]
-                static Exception GetException(string? text, string name)
-                {
-                    if (text is null)
-                    {
-                        return new ArgumentNullException(name, $"Parameter {AssertString(name)} (string) must not be null or empty, was null");
-                    }
-
-                    return new ArgumentException($"Parameter {AssertString(name)} (string) must not be null or empty, was empty", name);
-                }
-
-                throw GetException(text, name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNullOrWhitespace"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNullOrWhiteSpace(string? text, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} (string) must be null or whitespace, was {AssertString(text)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotNullOrWhitespace"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotNullOrWhiteSpace(string? text, string name)
-            {
-                [MethodImpl(MethodImplOptions.NoInlining)]
-                static Exception GetException(string? text, string name)
-                {
-                    if (text is null)
-                    {
-                        return new ArgumentNullException(name, $"Parameter {AssertString(name)} (string) must not be null or whitespace, was null");
-                    }
-
-                    return new ArgumentException($"Parameter {AssertString(name)} (string) must not be null or whitespace, was whitespace", name);
-                }
-
-                throw GetException(text, name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsEmpty"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsEmpty(string text, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} (string) must be empty, was {AssertString(text)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotEmpty"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotEmpty(string text, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} (string) must not be empty", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsWhitespace"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsWhiteSpace(string text, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} (string) must be whitespace, was {AssertString(text)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotWhitespace"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotWhiteSpace(string text, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} (string) must not be whitespace, was {AssertString(text)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo(string,int,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo(string text, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} (string) must have a size equal to {size}, had a size of {text.Length} and was {AssertString(text)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeNotEqualTo"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeNotEqualTo(string text, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} (string) must not have a size equal to {size}, was {AssertString(text)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThan"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThan(string text, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} (string) must have a size over {size}, had a size of {text.Length} and was {AssertString(text)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeGreaterThanOrEqualTo"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeGreaterThanOrEqualTo(string text, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} (string) must have a size of at least {size}, had a size of {text.Length} and was {AssertString(text)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThan"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThan(string text, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} (string) must have a size less than {size}, had a size of {text.Length} and was {AssertString(text)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo(string,int,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string text, int size, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} (string) must have a size less than or equal to {size}, had a size of {text.Length} and was {AssertString(text)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeEqualTo(string,string,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeEqualTo(string source, string destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} (string) must have a size equal to {AssertString(destination.Length)} (the destination), had a size of {AssertString(source.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasSizeLessThanOrEqualTo(string,string,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasSizeLessThanOrEqualTo(string source, string destination, string name)
-            {
-                throw new ArgumentException($"The source {AssertString(name)} (string) must have a size less than or equal to {AssertString(destination.Length)} (the destination), had a size of {AssertString(source.Length)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsInRangeFor(int,string,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsInRangeFor(int index, string text, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must be in the range given by <0> and {AssertString(text.Length)} to be a valid index for the target string, was {AssertString(index)}");
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Guard.IsNotInRangeFor(int,string,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentOutOfRangeExceptionForIsNotInRangeFor(int index, string text, string name)
-            {
-                throw new ArgumentOutOfRangeException(name, index, $"Parameter {AssertString(name)} (int) must not be in the range given by <0> and {AssertString(text.Length)} to be an invalid index for the target string, was {AssertString(index)}");
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Tasks.ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/Internals/Guard.Tasks.ThrowHelper.cs
deleted file mode 100644
index 7093be2fc7c..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Tasks.ThrowHelper.cs
+++ /dev/null
@@ -1,112 +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.CodeAnalysis;
-using System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Helper methods to efficiently throw exceptions.
-        /// </summary>
-        private static partial class ThrowHelper
-        {
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsCompleted"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsCompleted(Task task, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({task.GetType().ToTypeString()}) must be completed, had status {AssertString(task.Status)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotCompleted"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotCompleted(Task task, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({task.GetType().ToTypeString()}) must not be completed, had status {AssertString(task.Status)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsCompletedSuccessfully"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsCompletedSuccessfully(Task task, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({task.GetType().ToTypeString()}) must be completed successfully, had status {AssertString(task.Status)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotCompletedSuccessfully"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotCompletedSuccessfully(Task task, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({task.GetType().ToTypeString()}) must not be completed successfully, had status {AssertString(task.Status)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsFaulted"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsFaulted(Task task, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({task.GetType().ToTypeString()}) must be faulted, had status {AssertString(task.Status)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotFaulted"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotFaulted(Task task, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({task.GetType().ToTypeString()}) must not be faulted, had status {AssertString(task.Status)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsCanceled"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsCanceled(Task task, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({task.GetType().ToTypeString()}) must be canceled, had status {AssertString(task.Status)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotCanceled"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotCanceled(Task task, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({task.GetType().ToTypeString()}) must not be canceled, had status {AssertString(task.Status)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasStatusEqualTo"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasStatusEqualTo(Task task, TaskStatus status, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({task.GetType().ToTypeString()}) must have status {status}, had status {AssertString(task.Status)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.HasStatusNotEqualTo"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForHasStatusNotEqualTo(Task task, TaskStatus status, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({task.GetType().ToTypeString()}) must not have status {AssertString(status)}", name);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Internals/Guard.ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/Internals/Guard.ThrowHelper.cs
deleted file mode 100644
index ebe28da2904..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Internals/Guard.ThrowHelper.cs
+++ /dev/null
@@ -1,204 +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.CodeAnalysis;
-using System.Diagnostics.Contracts;
-
-namespace Microsoft.Toolkit.Diagnostics
-{
-    /// <summary>
-    /// Helper methods to verify conditions when running code.
-    /// </summary>
-    public static partial class Guard
-    {
-        /// <summary>
-        /// Helper methods to efficiently throw exceptions.
-        /// </summary>
-        private 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 AssertString(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>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNull<T>(T value, string name)
-                where T : class
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must be null, was {AssertString(value)} ({value.GetType().ToTypeString()})", name);
-            }
-
-            /// <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>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNull<T>(T? value, string name)
-                where T : struct
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T?).ToTypeString()}) must be null, was {AssertString(value)} ({typeof(T).ToTypeString()})", name);
-            }
-
-            /// <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>
-            [DoesNotReturn]
-            public static void ThrowArgumentNullExceptionForIsNotNull<T>(string name)
-            {
-                throw new ArgumentNullException(name, $"Parameter {AssertString(name)} ({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>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsOfType<T>(object value, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} must be of type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotOfType{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type of the input value.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotOfType<T>(object value, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} must not be of type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsOfType"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsOfType(object value, Type type, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} must be of type {type.ToTypeString()}, was {value.GetType().ToTypeString()}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotOfType"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotOfType(object value, Type type, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} must not be of type {type.ToTypeString()}, was {value.GetType().ToTypeString()}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsAssignableToType{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type being checked against.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsAssignableToType<T>(object value, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} must be assignable to type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsNotAssignableToType{T}"/> fails.
-            /// </summary>
-            /// <typeparam name="T">The type being checked against.</typeparam>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotAssignableToType<T>(object value, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} must not be assignable to type {typeof(T).ToTypeString()}, was {value.GetType().ToTypeString()}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsAssignableToType"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsAssignableToType(object value, Type type, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} must be assignable to type {type.ToTypeString()}, was {value.GetType().ToTypeString()}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsAssignableToType"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsNotAssignableToType(object value, Type type, string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} must not be assignable to type {type.ToTypeString()}, was {value.GetType().ToTypeString()}", name);
-            }
-
-            /// <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>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsReferenceEqualTo<T>(string name)
-                where T : class
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must be the same instance as the target object", name);
-            }
-
-            /// <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>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsReferenceNotEqualTo<T>(string name)
-                where T : class
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} ({typeof(T).ToTypeString()}) must not be the same instance as the target object", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsTrue(bool,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsTrue(string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} must be true, was false", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsTrue(bool,string,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsTrue(string name, string message)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} must be true, was false: {AssertString(message)}", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsFalse(bool,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsFalse(string name)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} must be false, was true", name);
-            }
-
-            /// <summary>
-            /// Throws an <see cref="ArgumentException"/> when <see cref="Guard.IsFalse(bool,string,string)"/> fails.
-            /// </summary>
-            [DoesNotReturn]
-            public static void ThrowArgumentExceptionForIsFalse(string name, string message)
-            {
-                throw new ArgumentException($"Parameter {AssertString(name)} must be false, was true: {AssertString(message)}", name);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj b/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj
deleted file mode 100644
index 9c1f7d0a868..00000000000
--- a/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj
+++ /dev/null
@@ -1,100 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Nullable>Enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>netstandard1.4;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <Title>Windows Community Toolkit - Diagnostics (.NET Standard)</Title>
-    <Description>
-      This package includes .NET Standard code only helpers such as:
-        - Guard: Helper methods to verify conditions when running code.
-        - ThrowHelper: Helper methods to efficiently throw exceptions.
-    </Description>
-    <PackageTags>Diagnostics;Guard;ThrowHelper;TypeInfo;Extensions;Helpers</PackageTags>
-  </PropertyGroup>
-
-  <Choose>
-    <When Condition="'$(TargetFramework)' == 'netstandard1.4'">
-      <!-- .NET Standard 1.4 doesn't have the Span<T> type, ValueTuple or the [Pure] attribute -->
-      <ItemGroup>
-        <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>
-    </When>
-
-    <When Condition="'$(TargetFramework)' == 'netstandard2.0'">
-      <!-- .NET Standard 2.0 doesn't have the Span<T> type -->
-      <ItemGroup>
-        <PackageReference Include="System.Memory" Version="4.5.4" />
-      </ItemGroup>
-    </When>
-
-    <When Condition="'$(TargetFramework)' == 'netstandard2.1'">
-      <PropertyGroup>
-        <DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
-      </PropertyGroup>
-      <!-- .NET Standard 2.1 doesn't have the Unsafe type -->
-      <ItemGroup>
-        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
-      </ItemGroup>
-    </When>
-
-    <When Condition="'$(TargetFramework)' == 'net5.0'">
-      <PropertyGroup>
-        <DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
-      </PropertyGroup>
-    </When>
-  </Choose>
-
-  <ItemGroup>
-    <None Update="Generated\Guard.Comparable.Numeric.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>Guard.Comparable.Numeric.g.cs</LastGenOutput>
-    </None>
-    <None Update="Generated\Guard.Collection.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>Guard.Collection.g.cs</LastGenOutput>
-    </None>
-    <None Update="Generated\ThrowHelper.Collection.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>ThrowHelper.Collection.g.cs</LastGenOutput>
-    </None>
-    <None Update="Generated\TypeInfo.ttinclude">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>TypeInfo.g.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-
-  <!-- T4 service used by the Guard APIs -->
-  <ItemGroup>
-    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Generated\Guard.Comparable.Numeric.g.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Guard.Comparable.Numeric.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Generated\Guard.Collection.g.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Guard.Collection.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Generated\ThrowHelper.Collection.g.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>ThrowHelper.Collection.tt</DependentUpon>
-    </Compile>
-    <Compile Update="Generated\TypeInfo.g.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>TypeInfo.ttinclude</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/ThrowHelper.Generic.cs b/Microsoft.Toolkit.Diagnostics/ThrowHelper.Generic.cs
deleted file mode 100644
index 902032b4a58..00000000000
--- a/Microsoft.Toolkit.Diagnostics/ThrowHelper.Generic.cs
+++ /dev/null
@@ -1,1102 +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;
-#if !NETSTANDARD1_4
-using System.Runtime.InteropServices;
-#endif
-using System.Threading;
-
-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>
-        /// <exception cref="ArrayTypeMismatchException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowArrayTypeMismatchException<T>()
-        {
-            throw new ArrayTypeMismatchException();
-        }
-
-        /// <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>
-        /// <exception cref="ArgumentException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowArgumentException<T>()
-        {
-            throw new ArgumentException();
-        }
-
-        /// <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>
-        /// <exception cref="ArgumentNullException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowArgumentNullException<T>()
-        {
-            throw new ArgumentNullException();
-        }
-
-        /// <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>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowArgumentOutOfRangeException<T>()
-        {
-            throw new ArgumentOutOfRangeException();
-        }
-
-        /// <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="COMException"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of expected result.</typeparam>
-        /// <exception cref="COMException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowCOMException<T>()
-        {
-            throw new COMException();
-        }
-
-        /// <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>
-        /// <typeparam name="T">The type of expected result.</typeparam>
-        /// <exception cref="ExternalException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowExternalException<T>()
-        {
-            throw new ExternalException();
-        }
-
-        /// <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>
-        /// <exception cref="FormatException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowFormatException<T>()
-        {
-            throw new FormatException();
-        }
-
-        /// <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>
-        /// <exception cref="InsufficientMemoryException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowInsufficientMemoryException<T>()
-        {
-            throw new InsufficientMemoryException();
-        }
-
-        /// <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>
-        /// <exception cref="InvalidDataException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowInvalidDataException<T>()
-        {
-            throw new InvalidDataException();
-        }
-
-        /// <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>
-        /// <exception cref="InvalidOperationException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowInvalidOperationException<T>()
-        {
-            throw new InvalidOperationException();
-        }
-
-        /// <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>
-        /// <exception cref="LockRecursionException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowLockRecursionException<T>()
-        {
-            throw new LockRecursionException();
-        }
-
-        /// <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>
-        /// <exception cref="MissingFieldException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowMissingFieldException<T>()
-        {
-            throw new MissingFieldException();
-        }
-
-        /// <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>
-        /// <exception cref="MissingMemberException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowMissingMemberException<T>()
-        {
-            throw new MissingMemberException();
-        }
-
-        /// <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>
-        /// <exception cref="MissingMethodException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowMissingMethodException<T>()
-        {
-            throw new MissingMethodException();
-        }
-
-        /// <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>
-        /// <exception cref="NotSupportedException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowNotSupportedException<T>()
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <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>
-        /// <exception cref="OperationCanceledException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowOperationCanceledException<T>()
-        {
-            throw new OperationCanceledException();
-        }
-
-        /// <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>
-        /// <exception cref="PlatformNotSupportedException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowPlatformNotSupportedException<T>()
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <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>
-        /// <exception cref="SynchronizationLockException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowSynchronizationLockException<T>()
-        {
-            throw new SynchronizationLockException();
-        }
-
-        /// <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>
-        /// <exception cref="TimeoutException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowTimeoutException<T>()
-        {
-            throw new TimeoutException();
-        }
-
-        /// <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>
-        /// <exception cref="UnauthorizedAccessException">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowUnauthorizedAccessException<T>()
-        {
-            throw new UnauthorizedAccessException();
-        }
-
-        /// <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>
-        /// <exception cref="Win32Exception">Thrown with no parameters.</exception>
-        /// <returns>This method always throws, so it actually never returns a value.</returns>
-        [DoesNotReturn]
-        public static T ThrowWin32Exception<T>()
-        {
-            throw new Win32Exception();
-        }
-
-        /// <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);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Diagnostics/ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/ThrowHelper.cs
deleted file mode 100644
index 02b888fa5dc..00000000000
--- a/Microsoft.Toolkit.Diagnostics/ThrowHelper.cs
+++ /dev/null
@@ -1,940 +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;
-#if !NETSTANDARD1_4
-using System.Runtime.InteropServices;
-#endif
-using System.Threading;
-
-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>
-        /// <exception cref="ArrayTypeMismatchException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowArrayTypeMismatchException()
-        {
-            throw new ArrayTypeMismatchException();
-        }
-
-        /// <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>
-        /// <exception cref="ArgumentException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentException()
-        {
-            throw new ArgumentException();
-        }
-
-        /// <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>
-        /// <exception cref="ArgumentNullException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentNullException()
-        {
-            throw new ArgumentNullException();
-        }
-
-        /// <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>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowArgumentOutOfRangeException()
-        {
-            throw new ArgumentOutOfRangeException();
-        }
-
-        /// <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);
-        }
-
-#if !NETSTANDARD1_4
-        /// <summary>
-        /// Throws a new <see cref="COMException"/>.
-        /// </summary>
-        /// <exception cref="COMException">Thrown with no paarameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowCOMException()
-        {
-            throw new COMException();
-        }
-
-        /// <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>
-        /// <exception cref="ExternalException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowExternalException()
-        {
-            throw new ExternalException();
-        }
-
-        /// <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);
-        }
-#endif
-
-        /// <summary>
-        /// Throws a new <see cref="FormatException"/>.
-        /// </summary>
-        /// <exception cref="FormatException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowFormatException()
-        {
-            throw new FormatException();
-        }
-
-        /// <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);
-        }
-
-#if !NETSTANDARD1_4
-        /// <summary>
-        /// Throws a new <see cref="InsufficientMemoryException"/>.
-        /// </summary>
-        /// <exception cref="InsufficientMemoryException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowInsufficientMemoryException()
-        {
-            throw new InsufficientMemoryException();
-        }
-
-        /// <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);
-        }
-#endif
-
-        /// <summary>
-        /// Throws a new <see cref="InvalidDataException"/>.
-        /// </summary>
-        /// <exception cref="InvalidDataException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowInvalidDataException()
-        {
-            throw new InvalidDataException();
-        }
-
-        /// <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>
-        /// <exception cref="InvalidOperationException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowInvalidOperationException()
-        {
-            throw new InvalidOperationException();
-        }
-
-        /// <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>
-        /// <exception cref="LockRecursionException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowLockRecursionException()
-        {
-            throw new LockRecursionException();
-        }
-
-        /// <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>
-        /// <exception cref="MissingFieldException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowMissingFieldException()
-        {
-            throw new MissingFieldException();
-        }
-
-        /// <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);
-        }
-
-#if !NETSTANDARD1_4
-        /// <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);
-        }
-#endif
-
-        /// <summary>
-        /// Throws a new <see cref="MissingMemberException"/>.
-        /// </summary>
-        /// <exception cref="MissingMemberException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowMissingMemberException()
-        {
-            throw new MissingMemberException();
-        }
-
-        /// <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);
-        }
-
-#if !NETSTANDARD1_4
-        /// <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);
-        }
-#endif
-
-        /// <summary>
-        /// Throws a new <see cref="MissingMethodException"/>.
-        /// </summary>
-        /// <exception cref="MissingMethodException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowMissingMethodException()
-        {
-            throw new MissingMethodException();
-        }
-
-        /// <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);
-        }
-
-#if !NETSTANDARD1_4
-        /// <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);
-        }
-#endif
-
-        /// <summary>
-        /// Throws a new <see cref="NotSupportedException"/>.
-        /// </summary>
-        /// <exception cref="NotSupportedException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowNotSupportedException()
-        {
-            throw new NotSupportedException();
-        }
-
-        /// <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>
-        /// <exception cref="OperationCanceledException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowOperationCanceledException()
-        {
-            throw new OperationCanceledException();
-        }
-
-        /// <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>
-        /// <exception cref="PlatformNotSupportedException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowPlatformNotSupportedException()
-        {
-            throw new PlatformNotSupportedException();
-        }
-
-        /// <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>
-        /// <exception cref="SynchronizationLockException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowSynchronizationLockException()
-        {
-            throw new SynchronizationLockException();
-        }
-
-        /// <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>
-        /// <exception cref="TimeoutException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowTimeoutException()
-        {
-            throw new TimeoutException();
-        }
-
-        /// <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>
-        /// <exception cref="UnauthorizedAccessException">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowUnauthorizedAccessException()
-        {
-            throw new UnauthorizedAccessException();
-        }
-
-        /// <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>
-        /// <exception cref="Win32Exception">Thrown with no parameters.</exception>
-        [DoesNotReturn]
-        public static void ThrowWin32Exception()
-        {
-            throw new Win32Exception();
-        }
-
-        /// <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);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Attributes/NotNullWhenAttribute.cs b/Microsoft.Toolkit.HighPerformance/Attributes/NotNullWhenAttribute.cs
deleted file mode 100644
index dc2afc1783a..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Attributes/NotNullWhenAttribute.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.
-
-#if !NETSTANDARD2_1_OR_GREATER
-
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Specifies that when a method returns <see cref="ReturnValue"/>, the parameter
-    /// will not be null even if the corresponding type allows it.
-    /// </summary>
-    /// <remarks>Internal copy of the .NET Standard 2.1 attribute.</remarks>
-    [AttributeUsage(AttributeTargets.Parameter)]
-    internal sealed class NotNullWhenAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotNullWhenAttribute"/> class.
-        /// </summary>
-        /// <param name="returnValue">
-        /// The return value condition. If the method returns this value,
-        /// the associated parameter will not be <see langword="null"/>.
-        /// </param>
-        public NotNullWhenAttribute(bool returnValue)
-        {
-            ReturnValue = returnValue;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the return value should be <see langword="true"/>.
-        /// </summary>
-        public bool ReturnValue { get; }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Attributes/SkipLocalsInitAttribute.cs b/Microsoft.Toolkit.HighPerformance/Attributes/SkipLocalsInitAttribute.cs
deleted file mode 100644
index a2343c58ae4..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Attributes/SkipLocalsInitAttribute.cs
+++ /dev/null
@@ -1,28 +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.
-
-#if !NET5_0
-
-namespace System.Runtime.CompilerServices
-{
-    /// <summary>
-    /// Used to indicate to the compiler that the <c>.locals init</c> flag should not be set in method headers.
-    /// </summary>
-    /// <remarks>Internal copy of the .NET 5 attribute.</remarks>
-    [AttributeUsage(
-        AttributeTargets.Module |
-        AttributeTargets.Class |
-        AttributeTargets.Struct |
-        AttributeTargets.Interface |
-        AttributeTargets.Constructor |
-        AttributeTargets.Method |
-        AttributeTargets.Property |
-        AttributeTargets.Event,
-        Inherited = false)]
-    internal sealed class SkipLocalsInitAttribute : Attribute
-    {
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Box{T}.cs b/Microsoft.Toolkit.HighPerformance/Box{T}.cs
deleted file mode 100644
index 4a6d639b5b4..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Box{T}.cs
+++ /dev/null
@@ -1,229 +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;
-using System.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// A <see langword="class"/> that represents a boxed <typeparamref name="T"/> value on the managed heap.
-    /// This is a "shadow" type that can be used in place of a non-generic <see cref="object"/> reference to a
-    /// boxed value type, to make the code more expressive and reduce the chances of errors.
-    /// Consider this example:
-    /// <code>
-    /// object obj = 42;
-    ///
-    /// // Manual, error prone unboxing
-    /// int sum = (int)obj + 1;
-    /// </code>
-    /// In this example, it is not possible to know in advance what type is actually being boxed in a given
-    /// <see cref="object"/> instance, making the code less robust at build time. The <see cref="Box{T}"/>
-    /// type can be used as a drop-in replacement in this case, like so:
-    /// <code>
-    /// Box&lt;int> box = 42;
-    ///
-    /// // Build-time validation, automatic unboxing
-    /// int sum = box.Value + 1;
-    /// </code>
-    /// This type can also be useful when dealing with large custom value types that are also boxed, as
-    /// it allows to retrieve a mutable reference to the boxing value. This means that a given boxed
-    /// value can be mutated in-place, instead of having to allocate a new updated boxed instance.
-    /// </summary>
-    /// <typeparam name="T">The type of value being boxed.</typeparam>
-    [DebuggerDisplay("{ToString(),raw}")]
-    public sealed class Box<T>
-        where T : struct
-    {
-        // Boxed value types in the CLR are represented in memory as simple objects that store the method table of
-        // the corresponding T value type being boxed, and then the data of the value being boxed:
-        // [ sync block || pMethodTable || boxed T value ]
-        //                 ^               ^
-        //                 |               \-- Unsafe.Unbox<T>(Box<T>)
-        //                 \-- Box<T> reference
-        // For more info, see: https://mattwarren.org/2017/08/02/A-look-at-the-internals-of-boxing-in-the-CLR/.
-        // Note that there might be some padding before the actual data representing the boxed value,
-        // which might depend on both the runtime and the exact CPU architecture.
-        // This is automatically handled by the unbox !!T instruction in IL, which
-        // unboxes a given value type T and returns a reference to its boxed data.
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Box{T}"/> class.
-        /// </summary>
-        /// <remarks>
-        /// This constructor is never used, it is only declared in order to mark it with
-        /// the <see langword="private"/> visibility modifier and prevent direct use.
-        /// </remarks>
-        /// <exception cref="InvalidOperationException">Always thrown when this constructor is used (eg. from reflection).</exception>
-        private Box()
-        {
-            throw new InvalidOperationException("The Microsoft.Toolkit.HighPerformance.Box<T> constructor should never be used");
-        }
-
-        /// <summary>
-        /// Returns a <see cref="Box{T}"/> reference from the input <see cref="object"/> instance.
-        /// </summary>
-        /// <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>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Box<T> GetFrom(object obj)
-        {
-            if (obj.GetType() != typeof(T))
-            {
-                ThrowInvalidCastExceptionForGetFrom();
-            }
-
-            return Unsafe.As<Box<T>>(obj)!;
-        }
-
-        /// <summary>
-        /// Returns a <see cref="Box{T}"/> reference from the input <see cref="object"/> instance.
-        /// </summary>
-        /// <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 responsibility of the caller
-        /// to ensure it actually represents a boxed <typeparamref name="T"/> value and not some other instance.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Box<T> DangerousGetFrom(object obj)
-        {
-            return Unsafe.As<Box<T>>(obj)!;
-        }
-
-        /// <summary>
-        /// Tries to get a <see cref="Box{T}"/> reference from an input <see cref="object"/> representing a boxed <typeparamref name="T"/> value.
-        /// </summary>
-        /// <param name="obj">The input <see cref="object"/> instance to check.</param>
-        /// <param name="box">The resulting <see cref="Box{T}"/> reference, if <paramref name="obj"/> was a boxed <typeparamref name="T"/> value.</param>
-        /// <returns><see langword="true"/> if a <see cref="Box{T}"/> instance was retrieved correctly, <see langword="false"/> otherwise.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool TryGetFrom(object obj, [NotNullWhen(true)] out Box<T>? box)
-        {
-            if (obj.GetType() == typeof(T))
-            {
-                box = Unsafe.As<Box<T>>(obj)!;
-
-                return true;
-            }
-
-            box = null;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Implicitly gets the <typeparamref name="T"/> value from a given <see cref="Box{T}"/> instance.
-        /// </summary>
-        /// <param name="box">The input <see cref="Box{T}"/> instance.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator T(Box<T> box)
-        {
-            return (T)(object)box;
-        }
-
-        /// <summary>
-        /// Implicitly creates a new <see cref="Box{T}"/> instance from a given <typeparamref name="T"/> value.
-        /// </summary>
-        /// <param name="value">The input <typeparamref name="T"/> value to wrap.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator Box<T>(T value)
-        {
-            // The Box<T> type is never actually instantiated.
-            // Here we are just boxing the input T value, and then reinterpreting
-            // that object reference as a Box<T> reference. As such, the Box<T>
-            // type is really only used as an interface to access the contents
-            // of a boxed value type. This also makes it so that additional methods
-            // like ToString() or GetHashCode() will automatically be referenced from
-            // the method table of the boxed object, meaning that they don't need to
-            // manually be implemented in the Box<T> type. For instance, boxing a float
-            // and calling ToString() on it directly, on its boxed object or on a Box<T>
-            // reference retrieved from it will produce the same result in all cases.
-            return Unsafe.As<Box<T>>(value)!;
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            // Here we're overriding the base object virtual methods to ensure
-            // calls to those methods have a correct results on all runtimes.
-            // For instance, not doing so is causing issue on .NET Core 2.1 Release
-            // due to how the runtime handles the Box<T> reference to an actual
-            // boxed T value (not a concrete Box<T> instance as it would expect).
-            // To fix that, the overrides will simply call the expected methods
-            // directly on the boxed T values. These methods will be directly
-            // invoked by the JIT compiler when using a Box<T> reference. When
-            // an object reference is used instead, the call would be forwarded
-            // to those same methods anyway, since the method table for an object
-            // representing a T instance is the one of type T anyway.
-            return this.GetReference().ToString()!;
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object? obj)
-        {
-            return Equals(this, obj);
-        }
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return this.GetReference().GetHashCode();
-        }
-
-        /// <summary>
-        /// Throws an <see cref="InvalidCastException"/> when a cast from an invalid <see cref="object"/> is attempted.
-        /// </summary>
-        private static void ThrowInvalidCastExceptionForGetFrom()
-        {
-            throw new InvalidCastException($"Can't cast the input object to the type Box<{typeof(T)}>");
-        }
-    }
-
-#pragma warning disable SA1402 // Extensions being declared after the type they apply to
-#pragma warning disable SA1204 // Extension class to replace instance methods for Box<T>
-
-    /// <summary>
-    /// Helpers for working with the <see cref="Box{T}"/> type.
-    /// </summary>
-    public static class BoxExtensions
-    {
-        /// <summary>
-        /// Gets a <typeparamref name="T"/> reference from a <see cref="Box{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of reference to retrieve.</typeparam>
-        /// <param name="box">The input <see cref="Box{T}"/> instance.</param>
-        /// <returns>A <typeparamref name="T"/> reference to the boxed value within <paramref name="box"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T GetReference<T>(this Box<T> box)
-            where T : struct
-        {
-            // The reason why this method is an extension and is not part of
-            // the Box<T> type itself is that Box<T> is really just a mask
-            // used over object references, but it is never actually instantiated.
-            // Because of this, the method table of the objects in the heap will
-            // be the one of type T created by the runtime, and not the one of
-            // the Box<T> type. To avoid potential issues when invoking this method
-            // on different runtimes, which might handle that scenario differently,
-            // we use an extension method, which is just syntactic sugar for a static
-            // method belonging to another class. This isn't technically necessary,
-            // but it's just an extra precaution since the syntax for users remains
-            // exactly the same anyway. Here we just call the Unsafe.Unbox<T>(object)
-            // API, which is hidden away for users of the type for simplicity.
-            // Note that this API will always actually involve a conditional
-            // branch, which is introduced by the JIT compiler to validate the
-            // object instance being unboxed. But since the alternative of
-            // manually tracking the offset to the boxed data would be both
-            // more error prone, and it would still introduce some overhead,
-            // this doesn't really matter in this case anyway.
-            return ref Unsafe.Unbox<T>(box);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs
deleted file mode 100644
index 78d76036f90..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs
+++ /dev/null
@@ -1,365 +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.Buffers;
-using System.Diagnostics;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Buffers.Views;
-using Microsoft.Toolkit.HighPerformance.Helpers.Internals;
-
-namespace Microsoft.Toolkit.HighPerformance.Buffers
-{
-    /// <summary>
-    /// Represents a heap-based, array-backed output sink into which <typeparamref name="T"/> data can be written.
-    /// </summary>
-    /// <typeparam name="T">The type of items to write to the current instance.</typeparam>
-    /// <remarks>
-    /// This is a custom <see cref="IBufferWriter{T}"/> implementation that replicates the
-    /// functionality and API surface of the array-based buffer writer available in
-    /// .NET Standard 2.1, with the main difference being the fact that in this case
-    /// the arrays in use are rented from the shared <see cref="ArrayPool{T}"/> instance,
-    /// and that <see cref="ArrayPoolBufferWriter{T}"/> is also available on .NET Standard 2.0.
-    /// </remarks>
-    [DebuggerTypeProxy(typeof(MemoryDebugView<>))]
-    [DebuggerDisplay("{ToString(),raw}")]
-    public sealed class ArrayPoolBufferWriter<T> : IBuffer<T>, IMemoryOwner<T>
-    {
-        /// <summary>
-        /// The default buffer size to use to expand empty arrays.
-        /// </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>
-        private T[]? array;
-
-#pragma warning disable IDE0032 // Use field over auto-property (clearer and faster)
-        /// <summary>
-        /// The starting offset within <see cref="array"/>.
-        /// </summary>
-        private int index;
-#pragma warning restore IDE0032
-
-        /// <summary>
-        /// 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)
-        {
-        }
-
-        /// <summary>
-        /// 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="ArgumentOutOfRangeException">Thrown when <paramref name="initialCapacity"/> is not valid.</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="ArgumentOutOfRangeException">Thrown when <paramref name="initialCapacity"/> is not valid.</exception>
-        public ArrayPoolBufferWriter(ArrayPool<T> pool, int 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.
-            // 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;
-        }
-
-        /// <summary>
-        /// Finalizes an instance of the <see cref="ArrayPoolBufferWriter{T}"/> class.
-        /// </summary>
-        ~ArrayPoolBufferWriter() => Dispose();
-
-        /// <inheritdoc/>
-        Memory<T> IMemoryOwner<T>.Memory
-        {
-            // This property is explicitly implemented so that it's hidden
-            // under normal usage, as the name could be confusing when
-            // displayed besides WrittenMemory and GetMemory().
-            // The IMemoryOwner<T> interface is implemented primarily
-            // so that the AsStream() extension can be used on this type,
-            // allowing users to first create a ArrayPoolBufferWriter<byte>
-            // instance to write data to, then get a stream through the
-            // extension and let it take care of returning the underlying
-            // buffer to the shared pool when it's no longer necessary.
-            // Inlining is not needed here since this will always be a callvirt.
-            get => MemoryMarshal.AsMemory(WrittenMemory);
-        }
-
-        /// <inheritdoc/>
-        public ReadOnlyMemory<T> WrittenMemory
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                T[]? array = this.array;
-
-                if (array is null)
-                {
-                    ThrowObjectDisposedException();
-                }
-
-                return array!.AsMemory(0, this.index);
-            }
-        }
-
-        /// <inheritdoc/>
-        public ReadOnlySpan<T> WrittenSpan
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                T[]? array = this.array;
-
-                if (array is null)
-                {
-                    ThrowObjectDisposedException();
-                }
-
-                return array!.AsSpan(0, this.index);
-            }
-        }
-
-        /// <inheritdoc/>
-        public int WrittenCount
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.index;
-        }
-
-        /// <inheritdoc/>
-        public int Capacity
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                T[]? array = this.array;
-
-                if (array is null)
-                {
-                    ThrowObjectDisposedException();
-                }
-
-                return array!.Length;
-            }
-        }
-
-        /// <inheritdoc/>
-        public int FreeCapacity
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                T[]? array = this.array;
-
-                if (array is null)
-                {
-                    ThrowObjectDisposedException();
-                }
-
-                return array!.Length - this.index;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Clear()
-        {
-            T[]? array = this.array;
-
-            if (array is null)
-            {
-                ThrowObjectDisposedException();
-            }
-
-            array.AsSpan(0, this.index).Clear();
-
-            this.index = 0;
-        }
-
-        /// <inheritdoc/>
-        public void Advance(int count)
-        {
-            T[]? array = this.array;
-
-            if (array is null)
-            {
-                ThrowObjectDisposedException();
-            }
-
-            if (count < 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForNegativeCount();
-            }
-
-            if (this.index > array!.Length - count)
-            {
-                ThrowArgumentExceptionForAdvancedTooFar();
-            }
-
-            this.index += count;
-        }
-
-        /// <inheritdoc/>
-        public Memory<T> GetMemory(int sizeHint = 0)
-        {
-            CheckBufferAndEnsureCapacity(sizeHint);
-
-            return this.array.AsMemory(this.index);
-        }
-
-        /// <inheritdoc/>
-        public Span<T> GetSpan(int sizeHint = 0)
-        {
-            CheckBufferAndEnsureCapacity(sizeHint);
-
-            return this.array.AsSpan(this.index);
-        }
-
-        /// <summary>
-        /// Ensures that <see cref="array"/> has enough free space to contain a given number of new items.
-        /// </summary>
-        /// <param name="sizeHint">The minimum number of items to ensure space for in <see cref="array"/>.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CheckBufferAndEnsureCapacity(int sizeHint)
-        {
-            T[]? array = this.array;
-
-            if (array is null)
-            {
-                ThrowObjectDisposedException();
-            }
-
-            if (sizeHint < 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForNegativeSizeHint();
-            }
-
-            if (sizeHint == 0)
-            {
-                sizeHint = 1;
-            }
-
-            if (sizeHint > array!.Length - this.index)
-            {
-                ResizeBuffer(sizeHint);
-            }
-        }
-
-        /// <summary>
-        /// Resizes <see cref="array"/> to ensure it can fit the specified number of new items.
-        /// </summary>
-        /// <param name="sizeHint">The minimum number of items to ensure space for in <see cref="array"/>.</param>
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private void ResizeBuffer(int sizeHint)
-        {
-            int minimumSize = this.index + sizeHint;
-
-            // The ArrayPool<T> class has a maximum threshold of 1024 * 1024 for the maximum length of
-            // pooled arrays, and once this is exceeded it will just allocate a new array every time
-            // of exactly the requested size. In that case, we manually round up the requested size to
-            // the nearest power of two, to ensure that repeated consecutive writes when the array in
-            // use is bigger than that threshold don't end up causing a resize every single time.
-            if (minimumSize > 1024 * 1024)
-            {
-                minimumSize = BitOperations.RoundUpPowerOfTwo(minimumSize);
-            }
-
-            this.pool.Resize(ref this.array, minimumSize);
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            T[]? array = this.array;
-
-            if (array is null)
-            {
-                return;
-            }
-
-            GC.SuppressFinalize(this);
-
-            this.array = null;
-
-            this.pool.Return(array);
-        }
-
-        /// <inheritdoc/>
-        [Pure]
-        public override string ToString()
-        {
-            // See comments in MemoryOwner<T> about this
-            if (typeof(T) == typeof(char) &&
-                this.array is char[] chars)
-            {
-                return new string(chars, 0, this.index);
-            }
-
-            // Same representation used in Span<T>
-            return $"Microsoft.Toolkit.HighPerformance.Buffers.ArrayPoolBufferWriter<{typeof(T)}>[{this.index}]";
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the requested count is negative.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForNegativeCount()
-        {
-            throw new ArgumentOutOfRangeException("count", "The count can't be a negative value");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the size hint is negative.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForNegativeSizeHint()
-        {
-            throw new ArgumentOutOfRangeException("sizeHint", "The size hint can't be a negative value");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the requested count is negative.
-        /// </summary>
-        private static void ThrowArgumentExceptionForAdvancedTooFar()
-        {
-            throw new ArgumentException("The buffer writer has advanced too far");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ObjectDisposedException"/> when <see cref="array"/> is <see langword="null"/>.
-        /// </summary>
-        private static void ThrowObjectDisposedException()
-        {
-            throw new ObjectDisposedException("The current buffer has already been disposed");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/Enums/AllocationMode.cs b/Microsoft.Toolkit.HighPerformance/Buffers/Enums/AllocationMode.cs
deleted file mode 100644
index 70e1f208300..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Buffers/Enums/AllocationMode.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.HighPerformance.Buffers
-{
-    /// <summary>
-    /// An <see langword="enum"/> that indicates a mode to use when allocating buffers.
-    /// </summary>
-    public enum AllocationMode
-    {
-        /// <summary>
-        /// The default allocation mode for pooled memory (rented buffers are not cleared).
-        /// </summary>
-        Default,
-
-        /// <summary>
-        /// Clear pooled buffers when renting them.
-        /// </summary>
-        Clear
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/Interfaces/IBuffer{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/Interfaces/IBuffer{T}.cs
deleted file mode 100644
index 25e06861c81..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Buffers/Interfaces/IBuffer{T}.cs
+++ /dev/null
@@ -1,50 +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.Buffers;
-
-namespace Microsoft.Toolkit.HighPerformance.Buffers
-{
-    /// <summary>
-    /// An interface that expands <see cref="IBufferWriter{T}"/> with the ability to also inspect
-    /// the written data, and to reset the underlying buffer to write again from the start.
-    /// </summary>
-    /// <typeparam name="T">The type of items in the current buffer.</typeparam>
-    public interface IBuffer<T> : IBufferWriter<T>
-    {
-        /// <summary>
-        /// Gets the data written to the underlying buffer so far, as a <see cref="ReadOnlyMemory{T}"/>.
-        /// </summary>
-        ReadOnlyMemory<T> WrittenMemory { get; }
-
-        /// <summary>
-        /// Gets the data written to the underlying buffer so far, as a <see cref="ReadOnlySpan{T}"/>.
-        /// </summary>
-        ReadOnlySpan<T> WrittenSpan { get; }
-
-        /// <summary>
-        /// Gets the amount of data written to the underlying buffer so far.
-        /// </summary>
-        int WrittenCount { get; }
-
-        /// <summary>
-        /// Gets the total amount of space within the underlying buffer.
-        /// </summary>
-        int Capacity { get; }
-
-        /// <summary>
-        /// Gets the amount of space available that can still be written into without forcing the underlying buffer to grow.
-        /// </summary>
-        int FreeCapacity { get; }
-
-        /// <summary>
-        /// Clears the data written to the underlying buffer.
-        /// </summary>
-        /// <remarks>
-        /// You must clear the <see cref="IBuffer{T}"/> instance before trying to re-use it.
-        /// </remarks>
-        void Clear();
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/ArrayMemoryManager{TFrom,TTo}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/Internals/ArrayMemoryManager{TFrom,TTo}.cs
deleted file mode 100644
index 22720708505..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/ArrayMemoryManager{TFrom,TTo}.cs
+++ /dev/null
@@ -1,133 +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.Buffers;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Buffers.Internals.Interfaces;
-using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-
-namespace Microsoft.Toolkit.HighPerformance.Buffers.Internals
-{
-    /// <summary>
-    /// A custom <see cref="MemoryManager{T}"/> that casts data from a <typeparamref name="TFrom"/> array, to <typeparamref name="TTo"/> values.
-    /// </summary>
-    /// <typeparam name="TFrom">The source type of items to read.</typeparam>
-    /// <typeparam name="TTo">The target type to cast the source items to.</typeparam>
-    internal sealed class ArrayMemoryManager<TFrom, TTo> : MemoryManager<TTo>, IMemoryManager
-        where TFrom : unmanaged
-        where TTo : unmanaged
-    {
-        /// <summary>
-        /// The source <typeparamref name="TFrom"/> array to read data from.
-        /// </summary>
-        private readonly TFrom[] array;
-
-        /// <summary>
-        /// The starting offset within <see name="array"/>.
-        /// </summary>
-        private readonly int offset;
-
-        /// <summary>
-        /// The original used length for <see name="array"/>.
-        /// </summary>
-        private readonly int length;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ArrayMemoryManager{TFrom, TTo}"/> class.
-        /// </summary>
-        /// <param name="array">The source <typeparamref name="TFrom"/> array to read data from.</param>
-        /// <param name="offset">The starting offset within <paramref name="array"/>.</param>
-        /// <param name="length">The original used length for <paramref name="array"/>.</param>
-        public ArrayMemoryManager(TFrom[] array, int offset, int length)
-        {
-            this.array = array;
-            this.offset = offset;
-            this.length = length;
-        }
-
-        /// <inheritdoc/>
-        public override Span<TTo> GetSpan()
-        {
-#if SPAN_RUNTIME_SUPPORT
-            ref TFrom r0 = ref this.array.DangerousGetReferenceAt(this.offset);
-            ref TTo r1 = ref Unsafe.As<TFrom, TTo>(ref r0);
-            int length = RuntimeHelpers.ConvertLength<TFrom, TTo>(this.length);
-
-            return MemoryMarshal.CreateSpan(ref r1, length);
-#else
-            Span<TFrom> span = this.array.AsSpan(this.offset, this.length);
-
-            // We rely on MemoryMarshal.Cast here to deal with calculating the effective
-            // size of the new span to return. This will also make the behavior consistent
-            // for users that are both using this type as well as casting spans directly.
-            return MemoryMarshal.Cast<TFrom, TTo>(span);
-#endif
-        }
-
-        /// <inheritdoc/>
-        public override unsafe MemoryHandle Pin(int elementIndex = 0)
-        {
-            if ((uint)elementIndex >= (uint)(this.length * Unsafe.SizeOf<TFrom>() / Unsafe.SizeOf<TTo>()))
-            {
-                ThrowArgumentOutOfRangeExceptionForInvalidIndex();
-            }
-
-            int
-                bytePrefix = this.offset * Unsafe.SizeOf<TFrom>(),
-                byteSuffix = elementIndex * Unsafe.SizeOf<TTo>(),
-                byteOffset = bytePrefix + byteSuffix;
-
-            GCHandle handle = GCHandle.Alloc(this.array, GCHandleType.Pinned);
-
-            ref TFrom r0 = ref this.array.DangerousGetReference();
-            ref byte r1 = ref Unsafe.As<TFrom, byte>(ref r0);
-            ref byte r2 = ref Unsafe.Add(ref r1, byteOffset);
-            void* pi = Unsafe.AsPointer(ref r2);
-
-            return new MemoryHandle(pi, handle);
-        }
-
-        /// <inheritdoc/>
-        public override void Unpin()
-        {
-        }
-
-        /// <inheritdoc/>
-        protected override void Dispose(bool disposing)
-        {
-        }
-
-        /// <inheritdoc/>
-        public Memory<T> GetMemory<T>(int offset, int length)
-            where T : unmanaged
-        {
-            // We need to calculate the right offset and length of the new Memory<T>. The local offset
-            // is the original offset into the wrapped TFrom[] array, while the input offset is the one
-            // with respect to TTo items in the Memory<TTo> instance that is currently being cast.
-            int
-                absoluteOffset = this.offset + RuntimeHelpers.ConvertLength<TTo, TFrom>(offset),
-                absoluteLength = RuntimeHelpers.ConvertLength<TTo, TFrom>(length);
-
-            // We have a special handling in cases where the user is circling back to the original type
-            // of the wrapped array. In this case we can just return a memory wrapping that array directly,
-            // with offset and length being adjusted, without the memory manager indirection.
-            if (typeof(T) == typeof(TFrom))
-            {
-                return (Memory<T>)(object)this.array.AsMemory(absoluteOffset, absoluteLength);
-            }
-
-            return new ArrayMemoryManager<TFrom, T>(this.array, absoluteOffset, absoluteLength).Memory;
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the target index for <see cref="Pin"/> is invalid.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForInvalidIndex()
-        {
-            throw new ArgumentOutOfRangeException("elementIndex", "The input index is not in the valid range");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/Interfaces/IMemoryManager.cs b/Microsoft.Toolkit.HighPerformance/Buffers/Internals/Interfaces/IMemoryManager.cs
deleted file mode 100644
index cbffe3be17e..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/Interfaces/IMemoryManager.cs
+++ /dev/null
@@ -1,25 +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.Buffers;
-
-namespace Microsoft.Toolkit.HighPerformance.Buffers.Internals.Interfaces
-{
-    /// <summary>
-    /// An interface for a <see cref="MemoryManager{T}"/> instance that can reinterpret its underlying data.
-    /// </summary>
-    internal interface IMemoryManager
-    {
-        /// <summary>
-        /// Creates a new <see cref="Memory{T}"/> that reinterprets the underlying data for the current instance.
-        /// </summary>
-        /// <typeparam name="T">The target type to cast the items to.</typeparam>
-        /// <param name="offset">The starting offset within the data store.</param>
-        /// <param name="length">The original used length for the data store.</param>
-        /// <returns>A new <see cref="Memory{T}"/> instance of the specified type, reinterpreting the current items.</returns>
-        Memory<T> GetMemory<T>(int offset, int length)
-            where T : unmanaged;
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/ProxyMemoryManager{TFrom,TTo}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/Internals/ProxyMemoryManager{TFrom,TTo}.cs
deleted file mode 100644
index 573593b1722..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/ProxyMemoryManager{TFrom,TTo}.cs
+++ /dev/null
@@ -1,134 +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.Buffers;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Buffers.Internals.Interfaces;
-using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-
-namespace Microsoft.Toolkit.HighPerformance.Buffers.Internals
-{
-    /// <summary>
-    /// A custom <see cref="MemoryManager{T}"/> that casts data from a <see cref="MemoryManager{T}"/> of <typeparamref name="TFrom"/>, to <typeparamref name="TTo"/> values.
-    /// </summary>
-    /// <typeparam name="TFrom">The source type of items to read.</typeparam>
-    /// <typeparam name="TTo">The target type to cast the source items to.</typeparam>
-    internal sealed class ProxyMemoryManager<TFrom, TTo> : MemoryManager<TTo>, IMemoryManager
-        where TFrom : unmanaged
-        where TTo : unmanaged
-    {
-        /// <summary>
-        /// The source <see cref="MemoryManager{T}"/> to read data from.
-        /// </summary>
-        private readonly MemoryManager<TFrom> memoryManager;
-
-        /// <summary>
-        /// The starting offset within <see name="memoryManager"/>.
-        /// </summary>
-        private readonly int offset;
-
-        /// <summary>
-        /// The original used length for <see name="memoryManager"/>.
-        /// </summary>
-        private readonly int length;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ProxyMemoryManager{TFrom, TTo}"/> class.
-        /// </summary>
-        /// <param name="memoryManager">The source <see cref="MemoryManager{T}"/> to read data from.</param>
-        /// <param name="offset">The starting offset within <paramref name="memoryManager"/>.</param>
-        /// <param name="length">The original used length for <paramref name="memoryManager"/>.</param>
-        public ProxyMemoryManager(MemoryManager<TFrom> memoryManager, int offset, int length)
-        {
-            this.memoryManager = memoryManager;
-            this.offset = offset;
-            this.length = length;
-        }
-
-        /// <inheritdoc/>
-        public override Span<TTo> GetSpan()
-        {
-            Span<TFrom> span = this.memoryManager.GetSpan().Slice(this.offset, this.length);
-
-            return MemoryMarshal.Cast<TFrom, TTo>(span);
-        }
-
-        /// <inheritdoc/>
-        public override MemoryHandle Pin(int elementIndex = 0)
-        {
-            if ((uint)elementIndex >= (uint)(this.length * Unsafe.SizeOf<TFrom>() / Unsafe.SizeOf<TTo>()))
-            {
-                ThrowArgumentExceptionForInvalidIndex();
-            }
-
-            int
-                bytePrefix = this.offset * Unsafe.SizeOf<TFrom>(),
-                byteSuffix = elementIndex * Unsafe.SizeOf<TTo>(),
-                byteOffset = bytePrefix + byteSuffix;
-
-#if NETSTANDARD1_4
-            int
-                shiftedOffset = byteOffset / Unsafe.SizeOf<TFrom>(),
-                remainder = byteOffset - (shiftedOffset * Unsafe.SizeOf<TFrom>());
-#else
-            int shiftedOffset = Math.DivRem(byteOffset, Unsafe.SizeOf<TFrom>(), out int remainder);
-#endif
-
-            if (remainder != 0)
-            {
-                ThrowArgumentExceptionForInvalidAlignment();
-            }
-
-            return this.memoryManager.Pin(shiftedOffset);
-        }
-
-        /// <inheritdoc/>
-        public override void Unpin()
-        {
-            this.memoryManager.Unpin();
-        }
-
-        /// <inheritdoc/>
-        protected override void Dispose(bool disposing)
-        {
-            ((IDisposable)this.memoryManager).Dispose();
-        }
-
-        /// <inheritdoc/>
-        public Memory<T> GetMemory<T>(int offset, int length)
-            where T : unmanaged
-        {
-            // Like in the other memory manager, calculate the absolute offset and length
-            int
-                absoluteOffset = this.offset + RuntimeHelpers.ConvertLength<TTo, TFrom>(offset),
-                absoluteLength = RuntimeHelpers.ConvertLength<TTo, TFrom>(length);
-
-            // Skip one indirection level and slice the original memory manager, if possible
-            if (typeof(T) == typeof(TFrom))
-            {
-                return (Memory<T>)(object)this.memoryManager.Memory.Slice(absoluteOffset, absoluteLength);
-            }
-
-            return new ProxyMemoryManager<TFrom, T>(this.memoryManager, absoluteOffset, absoluteLength).Memory;
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the target index for <see cref="Pin"/> is invalid.
-        /// </summary>
-        private static void ThrowArgumentExceptionForInvalidIndex()
-        {
-            throw new ArgumentOutOfRangeException("elementIndex", "The input index is not in the valid range");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when <see cref="Pin"/> receives an invalid target index.
-        /// </summary>
-        private static void ThrowArgumentExceptionForInvalidAlignment()
-        {
-            throw new ArgumentOutOfRangeException("elementIndex", "The input index doesn't result in an aligned item access");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/RawObjectMemoryManager{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/Internals/RawObjectMemoryManager{T}.cs
deleted file mode 100644
index 6fd78e45609..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/RawObjectMemoryManager{T}.cs
+++ /dev/null
@@ -1,98 +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.
-
-#if SPAN_RUNTIME_SUPPORT
-
-using System;
-using System.Buffers;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Helpers;
-
-namespace Microsoft.Toolkit.HighPerformance.Buffers.Internals
-{
-    /// <summary>
-    /// A custom <see cref="MemoryManager{T}"/> that can wrap arbitrary <see cref="object"/> instances.
-    /// </summary>
-    /// <typeparam name="T">The type of elements in the target memory area.</typeparam>
-    internal sealed class RawObjectMemoryManager<T> : MemoryManager<T>
-    {
-        /// <summary>
-        /// The target <see cref="object"/> instance.
-        /// </summary>
-        private readonly object instance;
-
-        /// <summary>
-        /// The initial offset within <see cref="instance"/>.
-        /// </summary>
-        private readonly IntPtr offset;
-
-        /// <summary>
-        /// The length of the target memory area.
-        /// </summary>
-        private readonly int length;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RawObjectMemoryManager{T}"/> class.
-        /// </summary>
-        /// <param name="instance">The target <see cref="object"/> instance.</param>
-        /// <param name="offset">The starting offset within <paramref name="instance"/>.</param>
-        /// <param name="length">The usable length within <paramref name="instance"/>.</param>
-        public RawObjectMemoryManager(object instance, IntPtr offset, int length)
-        {
-            this.instance = instance;
-            this.offset = offset;
-            this.length = length;
-        }
-
-        /// <inheritdoc/>
-        public override Span<T> GetSpan()
-        {
-            ref T r0 = ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(this.instance, this.offset);
-
-            return MemoryMarshal.CreateSpan(ref r0, this.length);
-        }
-
-        /// <inheritdoc/>
-        public override unsafe MemoryHandle Pin(int elementIndex = 0)
-        {
-            if ((uint)elementIndex >= (uint)this.length)
-            {
-                ThrowArgumentOutOfRangeExceptionForInvalidElementIndex();
-            }
-
-            // Allocating a pinned handle for the array with fail and throw an exception
-            // if the array contains non blittable data. This is the expected behavior and
-            // the same happens when trying to pin a Memory<T> instance obtained through
-            // traditional means (eg. via the implicit T[] array conversion), if T is a
-            // reference type or a type containing some references.
-            GCHandle handle = GCHandle.Alloc(this.instance, GCHandleType.Pinned);
-            ref T r0 = ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(this.instance, this.offset);
-            ref T r1 = ref Unsafe.Add(ref r0, (nint)(uint)elementIndex);
-            void* p = Unsafe.AsPointer(ref r1);
-
-            return new MemoryHandle(p, handle);
-        }
-
-        /// <inheritdoc/>
-        public override void Unpin()
-        {
-        }
-
-        /// <inheritdoc/>
-        protected override void Dispose(bool disposing)
-        {
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the input index for <see cref="Pin"/> is not valid.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForInvalidElementIndex()
-        {
-            throw new ArgumentOutOfRangeException("elementIndex", "The input element index was not in the valid range");
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/StringMemoryManager{TTo}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/Internals/StringMemoryManager{TTo}.cs
deleted file mode 100644
index 0c2e62817d6..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/StringMemoryManager{TTo}.cs
+++ /dev/null
@@ -1,125 +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.Buffers;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Buffers.Internals.Interfaces;
-using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-
-namespace Microsoft.Toolkit.HighPerformance.Buffers.Internals
-{
-    /// <summary>
-    /// A custom <see cref="MemoryManager{T}"/> that casts data from a <see cref="string"/> to <typeparamref name="TTo"/> values.
-    /// </summary>
-    /// <typeparam name="TTo">The target type to cast the source characters to.</typeparam>
-    internal sealed class StringMemoryManager<TTo> : MemoryManager<TTo>, IMemoryManager
-        where TTo : unmanaged
-    {
-        /// <summary>
-        /// The source <see cref="string"/> to read data from.
-        /// </summary>
-        private readonly string text;
-
-        /// <summary>
-        /// The starting offset within <see name="array"/>.
-        /// </summary>
-        private readonly int offset;
-
-        /// <summary>
-        /// The original used length for <see name="array"/>.
-        /// </summary>
-        private readonly int length;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StringMemoryManager{T}"/> class.
-        /// </summary>
-        /// <param name="text">The source <see cref="string"/> to read data from.</param>
-        /// <param name="offset">The starting offset within <paramref name="text"/>.</param>
-        /// <param name="length">The original used length for <paramref name="text"/>.</param>
-        public StringMemoryManager(string text, int offset, int length)
-        {
-            this.text = text;
-            this.offset = offset;
-            this.length = length;
-        }
-
-        /// <inheritdoc/>
-        public override Span<TTo> GetSpan()
-        {
-#if SPAN_RUNTIME_SUPPORT
-            ref char r0 = ref this.text.DangerousGetReferenceAt(this.offset);
-            ref TTo r1 = ref Unsafe.As<char, TTo>(ref r0);
-            int length = RuntimeHelpers.ConvertLength<char, TTo>(this.length);
-
-            return MemoryMarshal.CreateSpan(ref r1, length);
-#else
-            ReadOnlyMemory<char> memory = this.text.AsMemory(this.offset, this.length);
-            Span<char> span = MemoryMarshal.AsMemory(memory).Span;
-
-            return MemoryMarshal.Cast<char, TTo>(span);
-#endif
-        }
-
-        /// <inheritdoc/>
-        public override unsafe MemoryHandle Pin(int elementIndex = 0)
-        {
-            if ((uint)elementIndex >= (uint)(this.length * Unsafe.SizeOf<char>() / Unsafe.SizeOf<TTo>()))
-            {
-                ThrowArgumentOutOfRangeExceptionForInvalidIndex();
-            }
-
-            int
-                bytePrefix = this.offset * Unsafe.SizeOf<char>(),
-                byteSuffix = elementIndex * Unsafe.SizeOf<TTo>(),
-                byteOffset = bytePrefix + byteSuffix;
-
-            GCHandle handle = GCHandle.Alloc(this.text, GCHandleType.Pinned);
-
-            ref char r0 = ref this.text.DangerousGetReference();
-            ref byte r1 = ref Unsafe.As<char, byte>(ref r0);
-            ref byte r2 = ref Unsafe.Add(ref r1, byteOffset);
-            void* pi = Unsafe.AsPointer(ref r2);
-
-            return new MemoryHandle(pi, handle);
-        }
-
-        /// <inheritdoc/>
-        public override void Unpin()
-        {
-        }
-
-        /// <inheritdoc/>
-        protected override void Dispose(bool disposing)
-        {
-        }
-
-        /// <inheritdoc/>
-        public Memory<T> GetMemory<T>(int offset, int length)
-            where T : unmanaged
-        {
-            int
-                absoluteOffset = this.offset + RuntimeHelpers.ConvertLength<TTo, char>(offset),
-                absoluteLength = RuntimeHelpers.ConvertLength<TTo, char>(length);
-
-            if (typeof(T) == typeof(char))
-            {
-                ReadOnlyMemory<char> memory = this.text.AsMemory(absoluteOffset, absoluteLength);
-
-                return (Memory<T>)(object)MemoryMarshal.AsMemory(memory);
-            }
-
-            return new StringMemoryManager<T>(this.text, absoluteOffset, absoluteLength).Memory;
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the target index for <see cref="Pin"/> is invalid.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForInvalidIndex()
-        {
-            throw new ArgumentOutOfRangeException("elementIndex", "The input index is not in the valid range");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs
deleted file mode 100644
index 85073104aad..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryBufferWriter{T}.cs
+++ /dev/null
@@ -1,192 +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.Buffers;
-using System.Diagnostics;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance.Buffers.Views;
-
-namespace Microsoft.Toolkit.HighPerformance.Buffers
-{
-    /// <summary>
-    /// 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>
-    /// This is a custom <see cref="IBufferWriter{T}"/> implementation that wraps a <see cref="Memory{T}"/> instance.
-    /// It can be used to bridge APIs consuming an <see cref="IBufferWriter{T}"/> with existing <see cref="Memory{T}"/>
-    /// instances (or objects that can be converted to a <see cref="Memory{T}"/>), to ensure the data is written directly
-    /// to the intended buffer, with no possibility of doing additional allocations or expanding the available capacity.
-    /// </remarks>
-    [DebuggerTypeProxy(typeof(MemoryDebugView<>))]
-    [DebuggerDisplay("{ToString(),raw}")]
-    public sealed class MemoryBufferWriter<T> : IBuffer<T>
-    {
-        /// <summary>
-        /// The underlying <see cref="Memory{T}"/> instance.
-        /// </summary>
-        private readonly Memory<T> memory;
-
-#pragma warning disable IDE0032 // Use field over auto-property (like in ArrayPoolBufferWriter<T>)
-        /// <summary>
-        /// The starting offset within <see cref="memory"/>.
-        /// </summary>
-        private int index;
-#pragma warning restore IDE0032
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryBufferWriter{T}"/> class.
-        /// </summary>
-        /// <param name="memory">The target <see cref="Memory{T}"/> instance to write to.</param>
-        public MemoryBufferWriter(Memory<T> memory)
-        {
-            this.memory = memory;
-        }
-
-        /// <inheritdoc/>
-        public ReadOnlyMemory<T> WrittenMemory
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.memory.Slice(0, this.index);
-        }
-
-        /// <inheritdoc/>
-        public ReadOnlySpan<T> WrittenSpan
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.memory.Slice(0, this.index).Span;
-        }
-
-        /// <inheritdoc/>
-        public int WrittenCount
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.index;
-        }
-
-        /// <inheritdoc/>
-        public int Capacity
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.memory.Length;
-        }
-
-        /// <inheritdoc/>
-        public int FreeCapacity
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.memory.Length - this.index;
-        }
-
-        /// <inheritdoc/>
-        public void Clear()
-        {
-            this.memory.Slice(0, this.index).Span.Clear();
-            this.index = 0;
-        }
-
-        /// <inheritdoc/>
-        public void Advance(int count)
-        {
-            if (count < 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForNegativeCount();
-            }
-
-            if (this.index > this.memory.Length - count)
-            {
-                ThrowArgumentExceptionForAdvancedTooFar();
-            }
-
-            this.index += count;
-        }
-
-        /// <inheritdoc/>
-        public Memory<T> GetMemory(int sizeHint = 0)
-        {
-            ValidateSizeHint(sizeHint);
-
-            return this.memory.Slice(this.index);
-        }
-
-        /// <inheritdoc/>
-        public Span<T> GetSpan(int sizeHint = 0)
-        {
-            ValidateSizeHint(sizeHint);
-
-            return this.memory.Slice(this.index).Span;
-        }
-
-        /// <summary>
-        /// Validates the requested size for either <see cref="GetMemory"/> or <see cref="GetSpan"/>.
-        /// </summary>
-        /// <param name="sizeHint">The minimum number of items to ensure space for in <see cref="memory"/>.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ValidateSizeHint(int sizeHint)
-        {
-            if (sizeHint < 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForNegativeSizeHint();
-            }
-
-            if (sizeHint == 0)
-            {
-                sizeHint = 1;
-            }
-
-            if (sizeHint > FreeCapacity)
-            {
-                ThrowArgumentExceptionForCapacityExceeded();
-            }
-        }
-
-        /// <inheritdoc/>
-        [Pure]
-        public override string ToString()
-        {
-            // See comments in MemoryOwner<T> about this
-            if (typeof(T) == typeof(char))
-            {
-                return this.memory.Slice(0, this.index).ToString();
-            }
-
-            // Same representation used in Span<T>
-            return $"Microsoft.Toolkit.HighPerformance.Buffers.MemoryBufferWriter<{typeof(T)}>[{this.index}]";
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the requested count is negative.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForNegativeCount()
-        {
-            throw new ArgumentOutOfRangeException("count", "The count can't be a negative value");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the size hint is negative.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForNegativeSizeHint()
-        {
-            throw new ArgumentOutOfRangeException("sizeHint", "The size hint can't be a negative value");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the requested count is negative.
-        /// </summary>
-        private static void ThrowArgumentExceptionForAdvancedTooFar()
-        {
-            throw new ArgumentException("The buffer writer has advanced too far");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when the requested size exceeds the capacity.
-        /// </summary>
-        private static void ThrowArgumentExceptionForCapacityExceeded()
-        {
-            throw new ArgumentException("The buffer writer doesn't have enough capacity left");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs
deleted file mode 100644
index 75c965a7c37..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs
+++ /dev/null
@@ -1,355 +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.Buffers;
-using System.Diagnostics;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-#if NETCORE_RUNTIME || NET5_0
-using System.Runtime.InteropServices;
-#endif
-using Microsoft.Toolkit.HighPerformance.Buffers.Views;
-
-namespace Microsoft.Toolkit.HighPerformance.Buffers
-{
-    /// <summary>
-    /// An <see cref="IMemoryOwner{T}"/> implementation with an embedded length and a fast <see cref="Span{T}"/> accessor.
-    /// </summary>
-    /// <typeparam name="T">The type of items to store in the current instance.</typeparam>
-    [DebuggerTypeProxy(typeof(MemoryDebugView<>))]
-    [DebuggerDisplay("{ToString(),raw}")]
-    public sealed class MemoryOwner<T> : IMemoryOwner<T>
-    {
-        /// <summary>
-        /// The starting offset within <see cref="array"/>.
-        /// </summary>
-        private readonly int start;
-
-#pragma warning disable IDE0032
-        /// <summary>
-        /// The usable length within <see cref="array"/> (starting from <see cref="start"/>).
-        /// </summary>
-        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>
-        private T[]? array;
-
-        /// <summary>
-        /// 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, ArrayPool<T> pool, AllocationMode mode)
-        {
-            this.start = 0;
-            this.length = length;
-            this.pool = pool;
-            this.array = pool.Rent(length);
-
-            if (mode == AllocationMode.Clear)
-            {
-                this.array.AsSpan(0, length).Clear();
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryOwner{T}"/> class with the specified parameters.
-        /// </summary>
-        /// <param name="start">The starting offset within <paramref name="array"/>.</param>
-        /// <param name="length">The length of the array to use.</param>
-        /// <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() => Dispose();
-
-        /// <summary>
-        /// Gets an empty <see cref="MemoryOwner{T}"/> instance.
-        /// </summary>
-        [Pure]
-        public static MemoryOwner<T> Empty
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => new(0, 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>
-        /// <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) => new(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(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(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, ArrayPool<T> pool, AllocationMode mode) => new(size, pool, mode);
-
-        /// <summary>
-        /// Gets the number of items in the current instance
-        /// </summary>
-        public int Length
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.length;
-        }
-
-        /// <inheritdoc/>
-        public Memory<T> Memory
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                T[]? array = this.array;
-
-                if (array is null)
-                {
-                    ThrowObjectDisposedException();
-                }
-
-                return new Memory<T>(array!, this.start, this.length);
-            }
-        }
-
-        /// <summary>
-        /// Gets a <see cref="Span{T}"/> wrapping the memory belonging to the current instance.
-        /// </summary>
-        public Span<T> Span
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                T[]? array = this.array;
-
-                if (array is null)
-                {
-                    ThrowObjectDisposedException();
-                }
-
-#if NETCORE_RUNTIME || NET5_0
-                ref T r0 = ref array!.DangerousGetReferenceAt(this.start);
-
-                // On .NET Core runtimes, we can manually create a span from the starting reference to
-                // skip the argument validations, which include an explicit null check, covariance check
-                // for the array and the actual validation for the starting offset and target length. We
-                // only do this on .NET Core as we can leverage the runtime-specific array layout to get
-                // a fast access to the initial element, which makes this trick worth it. Otherwise, on
-                // runtimes where we would need to at least access a static field to retrieve the base
-                // byte offset within an SZ array object, we can get better performance by just using the
-                // default Span<T> constructor and paying the cost of the extra conditional branches,
-                // especially if T is a value type, in which case the covariance check is JIT removed.
-                return MemoryMarshal.CreateSpan(ref r0, this.length);
-#else
-                return new Span<T>(array!, this.start, this.length);
-#endif
-            }
-        }
-
-        /// <summary>
-        /// Returns a reference to the first element within the current instance, with no bounds check.
-        /// </summary>
-        /// <returns>A reference to the first element within the current instance.</returns>
-        /// <exception cref="ObjectDisposedException">Thrown when the buffer in use has already been disposed.</exception>
-        /// <remarks>
-        /// This method does not perform bounds checks on the underlying buffer, but does check whether
-        /// the buffer itself has been disposed or not. This check should not be removed, and it's also
-        /// the reason why the method to get a reference at a specified offset is not present.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ref T DangerousGetReference()
-        {
-            T[]? array = this.array;
-
-            if (array is null)
-            {
-                ThrowObjectDisposedException();
-            }
-
-            return ref array!.DangerousGetReferenceAt(this.start);
-        }
-
-        /// <summary>
-        /// Gets an <see cref="ArraySegment{T}"/> instance wrapping the underlying <typeparamref name="T"/> array in use.
-        /// </summary>
-        /// <returns>An <see cref="ArraySegment{T}"/> instance wrapping the underlying <typeparamref name="T"/> array in use.</returns>
-        /// <exception cref="ObjectDisposedException">Thrown when the buffer in use has already been disposed.</exception>
-        /// <remarks>
-        /// This method is meant to be used when working with APIs that only accept an array as input, and should be used with caution.
-        /// In particular, the returned array is rented from an array pool, and it is responsibility of the caller to ensure that it's
-        /// not used after the current <see cref="MemoryOwner{T}"/> instance is disposed. Doing so is considered undefined behavior,
-        /// as the same array might be in use within another <see cref="MemoryOwner{T}"/> instance.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ArraySegment<T> DangerousGetArray()
-        {
-            T[]? array = this.array;
-
-            if (array is null)
-            {
-                ThrowObjectDisposedException();
-            }
-
-            return new ArraySegment<T>(array!, this.start, this.length);
-        }
-
-        /// <summary>
-        /// Slices the buffer currently in use and returns a new <see cref="MemoryOwner{T}"/> instance.
-        /// </summary>
-        /// <param name="start">The starting offset within the current buffer.</param>
-        /// <param name="length">The length of the buffer to use.</param>
-        /// <returns>A new <see cref="MemoryOwner{T}"/> instance using the target range of items.</returns>
-        /// <exception cref="ObjectDisposedException">Thrown when the buffer in use has already been disposed.</exception>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="start"/> or <paramref name="length"/> are not valid.</exception>
-        /// <remarks>
-        /// Using this method will dispose the current instance, and should only be used when an oversized
-        /// buffer is rented and then adjusted in size, to avoid having to rent a new buffer of the new
-        /// size and copy the previous items into the new one, or needing an additional variable/field
-        /// to manually handle to track the used range within a given <see cref="MemoryOwner{T}"/> instance.
-        /// </remarks>
-        public MemoryOwner<T> Slice(int start, int length)
-        {
-            T[]? array = this.array;
-
-            if (array is null)
-            {
-                ThrowObjectDisposedException();
-            }
-
-            this.array = null;
-
-            if ((uint)start > this.length)
-            {
-                ThrowInvalidOffsetException();
-            }
-
-            if ((uint)length > (this.length - start))
-            {
-                ThrowInvalidLengthException();
-            }
-
-            // We're transferring the ownership of the underlying array, so the current
-            // instance no longer needs to be disposed. Because of this, we can manually
-            // suppress the finalizer to reduce the overhead on the garbage collector.
-            GC.SuppressFinalize(this);
-
-            return new MemoryOwner<T>(start, length, this.pool, array!);
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            T[]? array = this.array;
-
-            if (array is null)
-            {
-                return;
-            }
-
-            GC.SuppressFinalize(this);
-
-            this.array = null;
-
-            this.pool.Return(array);
-        }
-
-        /// <inheritdoc/>
-        [Pure]
-        public override string ToString()
-        {
-            // Normally we would throw if the array has been disposed,
-            // but in this case we'll just return the non formatted
-            // representation as a fallback, since the ToString method
-            // is generally expected not to throw exceptions.
-            if (typeof(T) == typeof(char) &&
-                this.array is char[] chars)
-            {
-                return new string(chars, this.start, this.length);
-            }
-
-            // Same representation used in Span<T>
-            return $"Microsoft.Toolkit.HighPerformance.Buffers.MemoryOwner<{typeof(T)}>[{this.length}]";
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ObjectDisposedException"/> when <see cref="array"/> is <see langword="null"/>.
-        /// </summary>
-        private static void ThrowObjectDisposedException()
-        {
-            throw new ObjectDisposedException(nameof(MemoryOwner<T>), "The current buffer has already been disposed");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the <see cref="start"/> is invalid.
-        /// </summary>
-        private static void ThrowInvalidOffsetException()
-        {
-            throw new ArgumentOutOfRangeException(nameof(start), "The input start parameter was not valid");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the <see cref="length"/> is invalid.
-        /// </summary>
-        private static void ThrowInvalidLengthException()
-        {
-            throw new ArgumentOutOfRangeException(nameof(length), "The input length parameter was not valid");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/SpanOwner{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/SpanOwner{T}.cs
deleted file mode 100644
index 42a354865c2..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Buffers/SpanOwner{T}.cs
+++ /dev/null
@@ -1,211 +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.Buffers;
-using System.Diagnostics;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-#if NETCORE_RUNTIME || NET5_0
-using System.Runtime.InteropServices;
-#endif
-using Microsoft.Toolkit.HighPerformance.Buffers.Views;
-
-namespace Microsoft.Toolkit.HighPerformance.Buffers
-{
-    /// <summary>
-    /// A stack-only type with the ability to rent a buffer of a specified length and getting a <see cref="Span{T}"/> from it.
-    /// This type mirrors <see cref="MemoryOwner{T}"/> but without allocations and with further optimizations.
-    /// As this is a stack-only type, it relies on the duck-typed <see cref="IDisposable"/> pattern introduced with C# 8.
-    /// It should be used like so:
-    /// <code>
-    /// using (SpanOwner&lt;byte> buffer = SpanOwner&lt;byte>.Allocate(1024))
-    /// {
-    ///     // Use the buffer here...
-    /// }
-    /// </code>
-    /// As soon as the code leaves the scope of that <see langword="using"/> block, the underlying buffer will automatically
-    /// be disposed. The APIs in <see cref="SpanOwner{T}"/> rely on this pattern for extra performance, eg. they don't perform
-    /// the additional checks that are done in <see cref="MemoryOwner{T}"/> to ensure that the buffer hasn't been disposed
-    /// before returning a <see cref="Memory{T}"/> or <see cref="Span{T}"/> instance from it.
-    /// As such, this type should always be used with a <see langword="using"/> block or expression.
-    /// Not doing so will cause the underlying buffer not to be returned to the shared pool.
-    /// </summary>
-    /// <typeparam name="T">The type of items to store in the current instance.</typeparam>
-    [DebuggerTypeProxy(typeof(MemoryDebugView<>))]
-    [DebuggerDisplay("{ToString(),raw}")]
-    public readonly ref struct SpanOwner<T>
-    {
-#pragma warning disable IDE0032
-        /// <summary>
-        /// The usable length within <see cref="array"/>.
-        /// </summary>
-        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>
-        private readonly T[] array;
-
-        /// <summary>
-        /// 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, ArrayPool<T> pool, AllocationMode mode)
-        {
-            this.length = length;
-            this.pool = pool;
-            this.array = pool.Rent(length);
-
-            if (mode == AllocationMode.Clear)
-            {
-                this.array.AsSpan(0, length).Clear();
-            }
-        }
-
-        /// <summary>
-        /// Gets an empty <see cref="SpanOwner{T}"/> instance.
-        /// </summary>
-        [Pure]
-        public static SpanOwner<T> Empty
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => new(0, 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>
-        /// <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) => new(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(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(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, ArrayPool<T> pool, AllocationMode mode) => new(size, pool, mode);
-
-        /// <summary>
-        /// Gets the number of items in the current instance
-        /// </summary>
-        public int Length
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.length;
-        }
-
-        /// <summary>
-        /// Gets a <see cref="Span{T}"/> wrapping the memory belonging to the current instance.
-        /// </summary>
-        public Span<T> Span
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-#if NETCORE_RUNTIME || NET5_0
-                ref T r0 = ref array!.DangerousGetReference();
-
-                return MemoryMarshal.CreateSpan(ref r0, this.length);
-#else
-                return new Span<T>(this.array, 0, this.length);
-#endif
-            }
-        }
-
-        /// <summary>
-        /// Returns a reference to the first element within the current instance, with no bounds check.
-        /// </summary>
-        /// <returns>A reference to the first element within the current instance.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ref T DangerousGetReference()
-        {
-            return ref this.array.DangerousGetReference();
-        }
-
-        /// <summary>
-        /// Gets an <see cref="ArraySegment{T}"/> instance wrapping the underlying <typeparamref name="T"/> array in use.
-        /// </summary>
-        /// <returns>An <see cref="ArraySegment{T}"/> instance wrapping the underlying <typeparamref name="T"/> array in use.</returns>
-        /// <remarks>
-        /// This method is meant to be used when working with APIs that only accept an array as input, and should be used with caution.
-        /// In particular, the returned array is rented from an array pool, and it is responsibility of the caller to ensure that it's
-        /// not used after the current <see cref="SpanOwner{T}"/> instance is disposed. Doing so is considered undefined behavior,
-        /// as the same array might be in use within another <see cref="SpanOwner{T}"/> instance.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ArraySegment<T> DangerousGetArray()
-        {
-            return new(array!, 0, this.length);
-        }
-
-        /// <summary>
-        /// Implements the duck-typed <see cref="IDisposable.Dispose"/> method.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Dispose()
-        {
-            this.pool.Return(this.array);
-        }
-
-        /// <inheritdoc/>
-        [Pure]
-        public override string ToString()
-        {
-            if (typeof(T) == typeof(char) &&
-                this.array is char[] chars)
-            {
-                return new string(chars, 0, this.length);
-            }
-
-            // Same representation used in Span<T>
-            return $"Microsoft.Toolkit.HighPerformance.Buffers.SpanOwner<{typeof(T)}>[{this.length}]";
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
deleted file mode 100644
index c4b5b7e8338..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs
+++ /dev/null
@@ -1,799 +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.CodeAnalysis;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using System.Text;
-#if !NETSTANDARD1_4
-using Microsoft.Toolkit.HighPerformance.Helpers;
-#endif
-using BitOperations = Microsoft.Toolkit.HighPerformance.Helpers.Internals.BitOperations;
-
-#nullable enable
-
-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(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 least frequently
-    /// used values will be automatically discarded to leave room for new values to cache.
-    /// </summary>
-    public sealed class StringPool
-    {
-        /// <summary>
-        /// The size used by default by the parameterless constructor.
-        /// </summary>
-        private const int DefaultSize = 2048;
-
-        /// <summary>
-        /// The minimum size for <see cref="StringPool"/> instances.
-        /// </summary>
-        private const int MinimumSize = 32;
-
-        /// <summary>
-        /// The current array of <see cref="FixedSizePriorityMap"/> instances in use.
-        /// </summary>
-        private readonly FixedSizePriorityMap[] maps;
-
-        /// <summary>
-        /// The total number of maps in use.
-        /// </summary>
-        private readonly int numberOfMaps;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StringPool"/> class.
-        /// </summary>
-        public StringPool()
-            : this(DefaultSize)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StringPool"/> class.
-        /// </summary>
-        /// <param name="minimumSize">The minimum size for the pool to create.</param>
-        public StringPool(int minimumSize)
-        {
-            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 = BitOperations.RoundUpPowerOfTwo((int)a);
-                y = BitOperations.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 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 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);
-
-            int
-                p2 = x2 * y2,
-                p3 = x3 * y3,
-                p4 = x4 * y4;
-
-            if (p3 < p2)
-            {
-                p2 = p3;
-                x2 = x3;
-                y2 = y3;
-            }
-
-            if (p4 < p2)
-            {
-                p2 = p4;
-                x2 = x4;
-                y2 = y4;
-            }
-
-            Span<FixedSizePriorityMap> span = this.maps = new FixedSizePriorityMap[x2];
-
-            // 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 maps when retrieving a string instance.
-            foreach (ref FixedSizePriorityMap map in span)
-            {
-                map = new FixedSizePriorityMap(y2);
-            }
-
-            this.numberOfMaps = x2;
-
-            Size = p2;
-        }
-
-        /// <summary>
-        /// Gets the shared <see cref="StringPool"/> instance.
-        /// </summary>
-        /// <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();
-
-        /// <summary>
-        /// Gets the total number of <see cref="string"/> that can be stored in the current instance.
-        /// </summary>
-        public int Size { 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
-                hashcode = GetHashCode(value.AsSpan()),
-                bucketIndex = hashcode & (this.numberOfMaps - 1);
-
-            ref FixedSizePriorityMap map = ref this.maps.DangerousGetReferenceAt(bucketIndex);
-
-            lock (map.SyncRoot)
-            {
-                map.Add(value, hashcode);
-            }
-        }
-
-        /// <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
-                hashcode = GetHashCode(value.AsSpan()),
-                bucketIndex = hashcode & (this.numberOfMaps - 1);
-
-            ref FixedSizePriorityMap map = ref this.maps.DangerousGetReferenceAt(bucketIndex);
-
-            lock (map.SyncRoot)
-            {
-                return map.GetOrAdd(value, hashcode);
-            }
-        }
-
-        /// <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
-                hashcode = GetHashCode(span),
-                bucketIndex = hashcode & (this.numberOfMaps - 1);
-
-            ref FixedSizePriorityMap map = ref this.maps.DangerousGetReferenceAt(bucketIndex);
-
-            lock (map.SyncRoot)
-            {
-                return map.GetOrAdd(span, hashcode);
-            }
-        }
-
-        /// <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>
-        /// <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
-                hashcode = GetHashCode(span),
-                bucketIndex = hashcode & (this.numberOfMaps - 1);
-
-            ref FixedSizePriorityMap map = ref this.maps.DangerousGetReferenceAt(bucketIndex);
-
-            lock (map.SyncRoot)
-            {
-                return map.TryGet(span, hashcode, out value);
-            }
-        }
-
-        /// <summary>
-        /// Resets the current instance and its associated maps.
-        /// </summary>
-        public void Reset()
-        {
-            foreach (ref FixedSizePriorityMap map in this.maps.AsSpan())
-            {
-                lock (map.SyncRoot)
-                {
-                    map.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>
-            /// The index representing the end of a given list.
-            /// </summary>
-            private const int EndOfList = -1;
-
-            /// <summary>
-            /// The array of 1-based indices for the <see cref="MapEntry"/> items stored in <see cref="mapEntries"/>.
-            /// </summary>
-            private readonly int[] buckets;
-
-            /// <summary>
-            /// The array of currently cached entries (ie. the lists for each hash group).
-            /// </summary>
-            private readonly MapEntry[] mapEntries;
-
-            /// <summary>
-            /// The array of priority values associated to each item stored in <see cref="mapEntries"/>.
-            /// </summary>
-            private readonly HeapEntry[] heapEntries;
-
-            /// <summary>
-            /// The current number of items stored in the map.
-            /// </summary>
-            private int count;
-
-            /// <summary>
-            /// The current incremental timestamp for the items stored in <see cref="heapEntries"/>.
-            /// </summary>
-            private uint timestamp;
-
-            /// <summary>
-            /// A type representing a map entry, ie. a node in a given list.
-            /// </summary>
-            private struct MapEntry
-            {
-                /// <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>
-            /// A type representing a heap entry, used to associate priority to each item.
-            /// </summary>
-            private struct HeapEntry
-            {
-                /// <summary>
-                /// The timestamp for the current entry (ie. the priority for the item).
-                /// </summary>
-                public uint Timestamp;
-
-                /// <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.timestamp = 0;
-            }
-
-            /// <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;
-            }
-
-            /// <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 void Add(string value, int hashcode)
-            {
-                ref string target = ref TryGet(value.AsSpan(), hashcode);
-
-                if (Unsafe.IsNullRef(ref target))
-                {
-                    Insert(value, hashcode);
-                }
-                else
-                {
-                    target = value;
-                }
-            }
-
-            /// <summary>
-            /// 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)
-            {
-                ref string result = ref TryGet(value.AsSpan(), hashcode);
-
-                if (!Unsafe.IsNullRef(ref result))
-                {
-                    return result;
-                }
-
-                Insert(value, hashcode);
-
-                return value;
-            }
-
-            /// <summary>
-            /// 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)
-            {
-                ref string result = ref TryGet(span, hashcode);
-
-                if (!Unsafe.IsNullRef(ref result))
-                {
-                    return result;
-                }
-
-                string value = span.ToString();
-
-                Insert(value, hashcode);
-
-                return value;
-            }
-
-            /// <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 bool TryGet(ReadOnlySpan<char> span, int hashcode, [NotNullWhen(true)] out string? value)
-            {
-                ref string result = ref TryGet(span, hashcode);
-
-                if (!Unsafe.IsNullRef(ref result))
-                {
-                    value = result;
-
-                    return true;
-                }
-
-                value = null;
-
-                return false;
-            }
-
-            /// <summary>
-            /// 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.timestamp = 0;
-            }
-
-            /// <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>
-            /// <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)
-            {
-                ref MapEntry mapEntriesRef = ref this.mapEntries.DangerousGetReference();
-                ref MapEntry entry = ref Unsafe.NullRef<MapEntry>();
-                int
-                    length = this.buckets.Length,
-                    bucketIndex = hashcode & (length - 1);
-
-                for (int i = this.buckets.DangerousGetReferenceAt(bucketIndex) - 1;
-                     (uint)i < (uint)length;
-                     i = entry.NextIndex)
-                {
-                    entry = ref Unsafe.Add(ref mapEntriesRef, (nint)(uint)i);
-
-                    if (entry.HashCode == hashcode &&
-                        entry.Value!.AsSpan().SequenceEqual(span))
-                    {
-                        UpdateTimestamp(ref entry.HeapIndex);
-
-                        return ref entry.Value!;
-                    }
-                }
-
-                return ref Unsafe.NullRef<string>();
-            }
-
-            /// <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 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 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)
-                {
-                    entryIndex = heapEntriesRef.MapIndex;
-                    heapIndex = 0;
-
-                    ref MapEntry removedEntry = ref Unsafe.Add(ref mapEntriesRef, (nint)(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
-                {
-                    // If the free list is not empty, get that map node and update the field
-                    entryIndex = this.count;
-                    heapIndex = this.count;
-                }
-
-                int bucketIndex = hashcode & (this.buckets.Length - 1);
-                ref int targetBucket = ref Unsafe.Add(ref bucketsRef, (nint)(uint)bucketIndex);
-                ref MapEntry targetMapEntry = ref Unsafe.Add(ref mapEntriesRef, (nint)(uint)entryIndex);
-                ref HeapEntry targetHeapEntry = ref Unsafe.Add(ref heapEntriesRef, (nint)(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.MapIndex = entryIndex;
-
-                // Update the timestamp and balance the heap again
-                UpdateTimestamp(ref targetMapEntry.HeapIndex);
-            }
-
-            /// <summary>
-            /// Removes a specified <see cref="string"/> instance from the map to free up one slot.
-            /// </summary>
-            /// <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 void Remove(int hashcode, int mapIndex)
-            {
-                ref MapEntry mapEntriesRef = ref this.mapEntries.DangerousGetReference();
-                int
-                    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, (nint)(uint)entryIndex);
-
-                    // Check the current value for a match
-                    if (entryIndex == mapIndex)
-                    {
-                        // If this was not the first list node, update the parent as well
-                        if (lastIndex != EndOfList)
-                        {
-                            ref MapEntry lastEntry = ref Unsafe.Add(ref mapEntriesRef, (nint)(uint)lastIndex);
-
-                            lastEntry.NextIndex = candidate.NextIndex;
-                        }
-                        else
-                        {
-                            // Otherwise, update the target index from the bucket slot
-                            this.buckets.DangerousGetReferenceAt(bucketIndex) = candidate.NextIndex + 1;
-                        }
-
-                        this.count--;
-
-                        return;
-                    }
-
-                    // Move to the following node in the current list
-                    lastIndex = entryIndex;
-                    entryIndex = candidate.NextIndex;
-                }
-            }
-
-            /// <summary>
-            /// Updates the timestamp of a heap node at the specified index (which is then synced back).
-            /// </summary>
-            /// <param name="heapIndex">The index of the target heap node to update.</param>
-            [MethodImpl(MethodImplOptions.NoInlining)]
-            private void UpdateTimestamp(ref int 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, (nint)(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 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)
-                {
-                    // 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).
-                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.
-                while (true)
-                {
-                    // 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 < count)
-                    {
-                        ref HeapEntry child = ref Unsafe.Add(ref heapEntriesRef, (nint)(uint)left);
-
-                        if (child.Timestamp < minimum.Timestamp)
-                        {
-                            minimum = ref child;
-                            targetIndex = left;
-                        }
-                    }
-
-                    // Same check as above for the right child
-                    if (right < count)
-                    {
-                        ref HeapEntry child = ref Unsafe.Add(ref heapEntriesRef, (nint)(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, (nint)(uint)root.MapIndex).HeapIndex = targetIndex;
-                    Unsafe.Add(ref mapEntriesRef, (nint)(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;
-
-                    // Update the reference to the root node
-                    root = ref Unsafe.Add(ref heapEntriesRef, (nint)(uint)currentIndex);
-                }
-
-                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 void UpdateAllTimestamps()
-            {
-                int count = this.count;
-                ref HeapEntry heapEntriesRef = ref this.heapEntries.DangerousGetReference();
-
-                for (int i = 0; i < count; i++)
-                {
-                    Unsafe.Add(ref heapEntriesRef, (nint)(uint)i).Timestamp = (uint)i;
-                }
-            }
-        }
-
-        /// <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)
-        {
-#if NETSTANDARD1_4
-            return span.GetDjb2HashCode();
-#else
-            return HashCode<char>.Combine(span);
-#endif
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when the requested size exceeds the capacity.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeException()
-        {
-            throw new ArgumentOutOfRangeException("minimumSize", "The requested size must be greater than 0");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/Views/MemoryDebugView{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/Views/MemoryDebugView{T}.cs
deleted file mode 100644
index b273a8a4839..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Buffers/Views/MemoryDebugView{T}.cs
+++ /dev/null
@@ -1,57 +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.Diagnostics;
-
-namespace Microsoft.Toolkit.HighPerformance.Buffers.Views
-{
-    /// <summary>
-    /// A debug proxy used to display items in a 1D layout.
-    /// </summary>
-    /// <typeparam name="T">The type of items to display.</typeparam>
-    internal sealed class MemoryDebugView<T>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryDebugView{T}"/> class with the specified parameters.
-        /// </summary>
-        /// <param name="arrayPoolBufferWriter">The input <see cref="ArrayPoolBufferWriter{T}"/> instance with the items to display.</param>
-        public MemoryDebugView(ArrayPoolBufferWriter<T>? arrayPoolBufferWriter)
-        {
-            this.Items = arrayPoolBufferWriter?.WrittenSpan.ToArray();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryDebugView{T}"/> class with the specified parameters.
-        /// </summary>
-        /// <param name="memoryBufferWriter">The input <see cref="MemoryBufferWriter{T}"/> instance with the items to display.</param>
-        public MemoryDebugView(MemoryBufferWriter<T>? memoryBufferWriter)
-        {
-            this.Items = memoryBufferWriter?.WrittenSpan.ToArray();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryDebugView{T}"/> class with the specified parameters.
-        /// </summary>
-        /// <param name="memoryOwner">The input <see cref="MemoryOwner{T}"/> instance with the items to display.</param>
-        public MemoryDebugView(MemoryOwner<T>? memoryOwner)
-        {
-            this.Items = memoryOwner?.Span.ToArray();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryDebugView{T}"/> class with the specified parameters.
-        /// </summary>
-        /// <param name="spanOwner">The input <see cref="SpanOwner{T}"/> instance with the items to display.</param>
-        public MemoryDebugView(SpanOwner<T> spanOwner)
-        {
-            this.Items = spanOwner.Span.ToArray();
-        }
-
-        /// <summary>
-        /// Gets the items to display for the current instance
-        /// </summary>
-        [DebuggerBrowsable(DebuggerBrowsableState.Collapsed)]
-        public T[]? Items { get; }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlyRefEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlyRefEnumerable{T}.cs
deleted file mode 100644
index aa4507fafe8..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlyRefEnumerable{T}.cs
+++ /dev/null
@@ -1,472 +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;
-#if SPAN_RUNTIME_SUPPORT
-using System.Runtime.InteropServices;
-#endif
-using Microsoft.Toolkit.HighPerformance.Helpers.Internals;
-using Microsoft.Toolkit.HighPerformance.Memory.Internals;
-#if !SPAN_RUNTIME_SUPPORT
-using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-#endif
-
-namespace Microsoft.Toolkit.HighPerformance.Enumerables
-{
-    /// <summary>
-    /// A <see langword="ref"/> <see langword="struct"/> that iterates readonly items from arbitrary memory locations.
-    /// </summary>
-    /// <typeparam name="T">The type of items to enumerate.</typeparam>
-    public readonly ref struct ReadOnlyRefEnumerable<T>
-    {
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// The <see cref="ReadOnlySpan{T}"/> instance pointing to the first item in the target memory area.
-        /// </summary>
-        /// <remarks>The <see cref="ReadOnlySpan{T}.Length"/> field maps to the total available length.</remarks>
-        private readonly ReadOnlySpan<T> span;
-#else
-        /// <summary>
-        /// The target <see cref="object"/> instance, if present.
-        /// </summary>
-        private readonly object? instance;
-
-        /// <summary>
-        /// The initial offset within <see cref="instance"/>.
-        /// </summary>
-        private readonly IntPtr offset;
-
-        /// <summary>
-        /// The total available length for the sequence.
-        /// </summary>
-        private readonly int length;
-#endif
-
-        /// <summary>
-        /// The distance between items in the sequence to enumerate.
-        /// </summary>
-        /// <remarks>The distance refers to <typeparamref name="T"/> items, not byte offset.</remarks>
-        private readonly int step;
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyRefEnumerable{T}"/> struct.
-        /// </summary>
-        /// <param name="span">The <see cref="ReadOnlySpan{T}"/> instance pointing to the first item in the target memory area.</param>
-        /// <param name="step">The distance between items in the sequence to enumerate.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private ReadOnlyRefEnumerable(ReadOnlySpan<T> span, int step)
-        {
-            this.span = span;
-            this.step = step;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyRefEnumerable{T}"/> struct.
-        /// </summary>
-        /// <param name="reference">A reference to the first item of the sequence.</param>
-        /// <param name="length">The number of items in the sequence.</param>
-        /// <param name="step">The distance between items in the sequence to enumerate.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal ReadOnlyRefEnumerable(in T reference, int length, int step)
-        {
-            this.span = MemoryMarshal.CreateReadOnlySpan(ref Unsafe.AsRef(reference), length);
-            this.step = step;
-        }
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="ReadOnlyRefEnumerable{T}"/> struct with the specified parameters.
-        /// </summary>
-        /// <param name="value">The reference to the first <typeparamref name="T"/> item to map.</param>
-        /// <param name="length">The number of items in the sequence.</param>
-        /// <param name="step">The distance between items in the sequence to enumerate.</param>
-        /// <returns>A <see cref="ReadOnlyRefEnumerable{T}"/> instance with the specified parameters.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when one of the parameters are negative.</exception>
-        [Pure]
-        public static ReadOnlyRefEnumerable<T> DangerousCreate(in T value, int length, int step)
-        {
-            if (length < 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForLength();
-            }
-
-            if (step < 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForStep();
-            }
-
-            OverflowHelper.EnsureIsInNativeIntRange(length, 1, step);
-
-            return new ReadOnlyRefEnumerable<T>(in value, length, step);
-        }
-#else
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyRefEnumerable{T}"/> struct.
-        /// </summary>
-        /// <param name="instance">The target <see cref="object"/> instance.</param>
-        /// <param name="offset">The initial offset within <see paramref="instance"/>.</param>
-        /// <param name="length">The number of items in the sequence.</param>
-        /// <param name="step">The distance between items in the sequence to enumerate.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal ReadOnlyRefEnumerable(object? instance, IntPtr offset, int length, int step)
-        {
-            this.instance = instance;
-            this.offset = offset;
-            this.length = length;
-            this.step = step;
-        }
-#endif
-
-        /// <summary>
-        /// Gets the total available length for the sequence.
-        /// </summary>
-        public int Length
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-#if SPAN_RUNTIME_SUPPORT
-            get => this.span.Length;
-#else
-            get => this.length;
-#endif
-        }
-
-        /// <summary>
-        /// Gets the element at the specified zero-based index.
-        /// </summary>
-        /// <param name="index">The zero-based index of the element.</param>
-        /// <returns>A reference to the element at the specified index.</returns>
-        /// <exception cref="IndexOutOfRangeException">
-        /// Thrown when <paramref name="index"/> is invalid.
-        /// </exception>
-        public ref readonly T this[int index]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                if ((uint)index >= (uint)Length)
-                {
-                    ThrowHelper.ThrowIndexOutOfRangeException();
-                }
-
-#if SPAN_RUNTIME_SUPPORT
-                ref T r0 = ref MemoryMarshal.GetReference(this.span);
-#else
-                ref T r0 = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.instance, this.offset);
-#endif
-                nint offset = (nint)(uint)index * (nint)(uint)this.step;
-                ref T ri = ref Unsafe.Add(ref r0, offset);
-
-                return ref ri;
-            }
-        }
-
-#if NETSTANDARD2_1_OR_GREATER
-        /// <summary>
-        /// Gets the element at the specified zero-based index.
-        /// </summary>
-        /// <param name="index">The zero-based index of the element.</param>
-        /// <returns>A reference to the element at the specified index.</returns>
-        /// <exception cref="IndexOutOfRangeException">
-        /// Thrown when <paramref name="index"/> is invalid.
-        /// </exception>
-        public ref readonly T this[Index index]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => ref this[index.GetOffset(Length)];
-        }
-#endif
-
-        /// <inheritdoc cref="System.Collections.IEnumerable.GetEnumerator"/>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Enumerator GetEnumerator()
-        {
-#if SPAN_RUNTIME_SUPPORT
-            return new Enumerator(this.span, this.step);
-#else
-            return new Enumerator(this.instance, this.offset, this.length, this.step);
-#endif
-        }
-
-        /// <summary>
-        /// Copies the contents of this <see cref="ReadOnlyRefEnumerable{T}"/> into a destination <see cref="RefEnumerable{T}"/> instance.
-        /// </summary>
-        /// <param name="destination">The destination <see cref="RefEnumerable{T}"/> instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="destination"/> is shorter than the source <see cref="ReadOnlyRefEnumerable{T}"/> instance.
-        /// </exception>
-        public void CopyTo(RefEnumerable<T> destination)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            if (this.step == 1)
-            {
-                destination.CopyFrom(this.span);
-
-                return;
-            }
-
-            if (destination.Step == 1)
-            {
-                CopyTo(destination.Span);
-
-                return;
-            }
-
-            ref T sourceRef = ref this.span.DangerousGetReference();
-            ref T destinationRef = ref destination.Span.DangerousGetReference();
-            int
-                sourceLength = this.span.Length,
-                destinationLength = destination.Span.Length;
-#else
-            ref T sourceRef = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.instance, this.offset);
-            ref T destinationRef = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(destination.Instance, destination.Offset);
-            int
-                sourceLength = this.length,
-                destinationLength = destination.Length;
-#endif
-
-            if ((uint)destinationLength < (uint)sourceLength)
-            {
-                ThrowArgumentExceptionForDestinationTooShort();
-            }
-
-            RefEnumerableHelper.CopyTo(ref sourceRef, ref destinationRef, (nint)(uint)sourceLength, (nint)(uint)this.step, (nint)(uint)destination.Step);
-        }
-
-        /// <summary>
-        /// Attempts to copy the current <see cref="ReadOnlyRefEnumerable{T}"/> instance to a destination <see cref="RefEnumerable{T}"/>.
-        /// </summary>
-        /// <param name="destination">The target <see cref="RefEnumerable{T}"/> of the copy operation.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        public bool TryCopyTo(RefEnumerable<T> destination)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            int
-                sourceLength = this.span.Length,
-                destinationLength = destination.Span.Length;
-#else
-            int
-                sourceLength = this.length,
-                destinationLength = destination.Length;
-#endif
-
-            if (destinationLength >= sourceLength)
-            {
-                CopyTo(destination);
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Copies the contents of this <see cref="RefEnumerable{T}"/> into a destination <see cref="Span{T}"/> instance.
-        /// </summary>
-        /// <param name="destination">The destination <see cref="Span{T}"/> instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="destination"/> is shorter than the source <see cref="RefEnumerable{T}"/> instance.
-        /// </exception>
-        public void CopyTo(Span<T> destination)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            if (this.step == 1)
-            {
-                this.span.CopyTo(destination);
-
-                return;
-            }
-
-            ref T sourceRef = ref this.span.DangerousGetReference();
-            int length = this.span.Length;
-#else
-            ref T sourceRef = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.instance, this.offset);
-            int length = this.length;
-#endif
-            if ((uint)destination.Length < (uint)length)
-            {
-                ThrowArgumentExceptionForDestinationTooShort();
-            }
-
-            ref T destinationRef = ref destination.DangerousGetReference();
-
-            RefEnumerableHelper.CopyTo(ref sourceRef, ref destinationRef, (nint)(uint)length, (nint)(uint)this.step);
-        }
-
-        /// <summary>
-        /// Attempts to copy the current <see cref="RefEnumerable{T}"/> instance to a destination <see cref="Span{T}"/>.
-        /// </summary>
-        /// <param name="destination">The target <see cref="Span{T}"/> of the copy operation.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        public bool TryCopyTo(Span<T> destination)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            int length = this.span.Length;
-#else
-            int length = this.length;
-#endif
-
-            if (destination.Length >= length)
-            {
-                CopyTo(destination);
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc cref="RefEnumerable{T}.ToArray"/>
-        [Pure]
-        public T[] ToArray()
-        {
-#if SPAN_RUNTIME_SUPPORT
-            int length = this.span.Length;
-#else
-            int length = this.length;
-#endif
-
-            // Empty array if no data is mapped
-            if (length == 0)
-            {
-                return Array.Empty<T>();
-            }
-
-            T[] array = new T[length];
-
-            CopyTo(array);
-
-            return array;
-        }
-
-        /// <summary>
-        /// Implicitly converts a <see cref="RefEnumerable{T}"/> instance into a <see cref="ReadOnlyRefEnumerable{T}"/> one.
-        /// </summary>
-        /// <param name="enumerable">The input <see cref="RefEnumerable{T}"/> instance.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator ReadOnlyRefEnumerable<T>(RefEnumerable<T> enumerable)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            return new ReadOnlyRefEnumerable<T>(enumerable.Span, enumerable.Step);
-#else
-            return new ReadOnlyRefEnumerable<T>(enumerable.Instance, enumerable.Offset, enumerable.Length, enumerable.Step);
-#endif
-        }
-
-        /// <summary>
-        /// A custom enumerator type to traverse items within a <see cref="ReadOnlyRefEnumerable{T}"/> instance.
-        /// </summary>
-        public ref struct Enumerator
-        {
-#if SPAN_RUNTIME_SUPPORT
-            /// <inheritdoc cref="ReadOnlyRefEnumerable{T}.span"/>
-            private readonly ReadOnlySpan<T> span;
-#else
-            /// <inheritdoc cref="ReadOnlyRefEnumerable{T}.instance"/>
-            private readonly object? instance;
-
-            /// <inheritdoc cref="ReadOnlyRefEnumerable{T}.offset"/>
-            private readonly IntPtr offset;
-
-            /// <inheritdoc cref="ReadOnlyRefEnumerable{T}.length"/>
-            private readonly int length;
-#endif
-
-            /// <inheritdoc cref="ReadOnlyRefEnumerable{T}.step"/>
-            private readonly int step;
-
-            /// <summary>
-            /// The current position in the sequence.
-            /// </summary>
-            private int position;
-
-#if SPAN_RUNTIME_SUPPORT
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Enumerator"/> struct.
-            /// </summary>
-            /// <param name="span">The <see cref="ReadOnlySpan{T}"/> instance with the info on the items to traverse.</param>
-            /// <param name="step">The distance between items in the sequence to enumerate.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            internal Enumerator(ReadOnlySpan<T> span, int step)
-            {
-                this.span = span;
-                this.step = step;
-                this.position = -1;
-            }
-#else
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Enumerator"/> struct.
-            /// </summary>
-            /// <param name="instance">The target <see cref="object"/> instance.</param>
-            /// <param name="offset">The initial offset within <see paramref="instance"/>.</param>
-            /// <param name="length">The number of items in the sequence.</param>
-            /// <param name="step">The distance between items in the sequence to enumerate.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            internal Enumerator(object? instance, IntPtr offset, int length, int step)
-            {
-                this.instance = instance;
-                this.offset = offset;
-                this.length = length;
-                this.step = step;
-                this.position = -1;
-            }
-#endif
-
-            /// <inheritdoc cref="System.Collections.IEnumerator.MoveNext"/>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public bool MoveNext()
-            {
-#if SPAN_RUNTIME_SUPPORT
-                return ++this.position < this.span.Length;
-#else
-                return ++this.position < this.length;
-#endif
-            }
-
-            /// <inheritdoc cref="System.Collections.Generic.IEnumerator{T}.Current"/>
-            public readonly ref readonly T Current
-            {
-                [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get
-                {
-#if SPAN_RUNTIME_SUPPORT
-                    ref T r0 = ref this.span.DangerousGetReference();
-#else
-                    ref T r0 = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.instance, this.offset);
-#endif
-                    nint offset = (nint)(uint)this.position * (nint)(uint)this.step;
-                    ref T ri = ref Unsafe.Add(ref r0, offset);
-
-                    return ref ri;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "length" parameter is invalid.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForLength()
-        {
-            throw new ArgumentOutOfRangeException("length");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "step" parameter is invalid.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForStep()
-        {
-            throw new ArgumentOutOfRangeException("step");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when the target span is too short.
-        /// </summary>
-        private static void ThrowArgumentExceptionForDestinationTooShort()
-        {
-            throw new ArgumentException("The target span is too short to copy all the current items to");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs
deleted file mode 100644
index e06d23f16e8..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanEnumerable{T}.cs
+++ /dev/null
@@ -1,157 +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.ComponentModel;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.Toolkit.HighPerformance.Enumerables
-{
-    /// <summary>
-    /// A <see langword="ref"/> <see langword="struct"/> that enumerates the items in a given <see cref="ReadOnlySpan{T}"/> instance.
-    /// </summary>
-    /// <typeparam name="T">The type of items to enumerate.</typeparam>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public ref struct ReadOnlySpanEnumerable<T>
-    {
-        /// <summary>
-        /// The source <see cref="ReadOnlySpan{T}"/> instance.
-        /// </summary>
-        private readonly ReadOnlySpan<T> span;
-
-        /// <summary>
-        /// The current index within <see cref="span"/>.
-        /// </summary>
-        private int index;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlySpanEnumerable{T}"/> struct.
-        /// </summary>
-        /// <param name="span">The source <see cref="ReadOnlySpan{T}"/> instance.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ReadOnlySpanEnumerable(ReadOnlySpan<T> span)
-        {
-            this.span = span;
-            this.index = -1;
-        }
-
-        /// <summary>
-        /// 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;
-
-        /// <summary>
-        /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
-        /// </summary>
-        /// <returns><see langword="true"/> whether a new element is available, <see langword="false"/> otherwise</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool MoveNext()
-        {
-            return ++this.index < this.span.Length;
-        }
-
-        /// <summary>
-        /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
-        /// </summary>
-        public readonly Item Current
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-#if SPAN_RUNTIME_SUPPORT
-                ref T r0 = ref MemoryMarshal.GetReference(this.span);
-                ref T ri = ref Unsafe.Add(ref r0, (nint)(uint)this.index);
-
-                // See comment in SpanEnumerable<T> about this
-                return new Item(ref ri, this.index);
-#else
-                return new Item(this.span, this.index);
-#endif
-            }
-        }
-
-        /// <summary>
-        /// An item from a source <see cref="Span{T}"/> instance.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public readonly ref struct Item
-        {
-            /// <summary>
-            /// The source <see cref="ReadOnlySpan{T}"/> instance.
-            /// </summary>
-            private readonly ReadOnlySpan<T> span;
-
-#if SPAN_RUNTIME_SUPPORT
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Item"/> struct.
-            /// </summary>
-            /// <param name="value">A reference to the target value.</param>
-            /// <param name="index">The index of the target value.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Item(ref T value, int index)
-            {
-                this.span = MemoryMarshal.CreateReadOnlySpan(ref value, index);
-            }
-#else
-            /// <summary>
-            /// The current index within <see cref="span"/>.
-            /// </summary>
-            private readonly int index;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Item"/> struct.
-            /// </summary>
-            /// <param name="span">The source <see cref="ReadOnlySpan{T}"/> instance.</param>
-            /// <param name="index">The current index within <paramref name="span"/>.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Item(ReadOnlySpan<T> span, int index)
-            {
-                this.span = span;
-                this.index = index;
-            }
-#endif
-
-            /// <summary>
-            /// Gets the reference to the current value.
-            /// </summary>
-            public ref readonly T Value
-            {
-                [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get
-                {
-#if SPAN_RUNTIME_SUPPORT
-                    return ref MemoryMarshal.GetReference(this.span);
-#else
-                    ref T r0 = ref MemoryMarshal.GetReference(this.span);
-                    ref T ri = ref Unsafe.Add(ref r0, (nint)(uint)this.index);
-
-                    return ref ri;
-#endif
-                }
-            }
-
-            /// <summary>
-            /// Gets the current index.
-            /// </summary>
-            public int Index
-            {
-                [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get
-                {
-#if SPAN_RUNTIME_SUPPORT
-                    return this.span.Length;
-#else
-                    return this.index;
-#endif
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs
deleted file mode 100644
index f4d3e543614..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.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;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.HighPerformance.Enumerables
-{
-    /// <summary>
-    /// A <see langword="ref"/> <see langword="struct"/> that tokenizes a given <see cref="ReadOnlySpan{T}"/> instance.
-    /// </summary>
-    /// <typeparam name="T">The type of items to enumerate.</typeparam>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public ref struct ReadOnlySpanTokenizer<T>
-        where T : IEquatable<T>
-    {
-        /// <summary>
-        /// The source <see cref="ReadOnlySpan{T}"/> instance.
-        /// </summary>
-        private readonly ReadOnlySpan<T> span;
-
-        /// <summary>
-        /// The separator item to use.
-        /// </summary>
-        private readonly T separator;
-
-        /// <summary>
-        /// The current initial offset.
-        /// </summary>
-        private int start;
-
-        /// <summary>
-        /// The current final offset.
-        /// </summary>
-        private int end;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlySpanTokenizer{T}"/> struct.
-        /// </summary>
-        /// <param name="span">The source <see cref="ReadOnlySpan{T}"/> instance.</param>
-        /// <param name="separator">The separator item to use.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ReadOnlySpanTokenizer(ReadOnlySpan<T> span, T separator)
-        {
-            this.span = span;
-            this.separator = separator;
-            this.start = 0;
-            this.end = -1;
-        }
-
-        /// <summary>
-        /// 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;
-
-        /// <summary>
-        /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
-        /// </summary>
-        /// <returns><see langword="true"/> whether a new element is available, <see langword="false"/> otherwise</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool MoveNext()
-        {
-            int
-                newEnd = this.end + 1,
-                length = this.span.Length;
-
-            // Additional check if the separator is not the last character
-            if (newEnd <= length)
-            {
-                this.start = newEnd;
-
-                // We need to call this extension explicitly or the extension method resolution rules for the C# compiler
-                // will end up picking Microsoft.Toolkit.HighPerformance.ReadOnlySpanExtensions.IndexOf instead, even
-                // though the latter takes the parameter via a readonly reference. This is because the "in" modifier is
-                // implicit, which makes the signature compatible, and because extension methods are matched in such a
-                // way that methods "closest" to where they're used are preferred. Since this type shares the same root
-                // namespace, this makes that extension a better match, so that it overrides the MemoryExtensions one.
-                // This is not a problem for consumers of this package, as their code would be outside of the
-                // Microsoft.Toolkit.HighPerformance namespace, so both extensions would be "equally distant", so that
-                // when they're both in scope it will be possible to choose which one to use by adding an explicit "in".
-                int index = System.MemoryExtensions.IndexOf(this.span.Slice(newEnd), this.separator);
-
-                // Extract the current subsequence
-                if (index >= 0)
-                {
-                    this.end = newEnd + index;
-
-                    return true;
-                }
-
-                this.end = length;
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
-        /// </summary>
-        public readonly ReadOnlySpan<T> Current
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.span.Slice(this.start, this.end - this.start);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/RefEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/RefEnumerable{T}.cs
deleted file mode 100644
index 535b742befa..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/RefEnumerable{T}.cs
+++ /dev/null
@@ -1,560 +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;
-#if SPAN_RUNTIME_SUPPORT
-using System.Runtime.InteropServices;
-#endif
-using Microsoft.Toolkit.HighPerformance.Helpers.Internals;
-using Microsoft.Toolkit.HighPerformance.Memory.Internals;
-#if !SPAN_RUNTIME_SUPPORT
-using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-#endif
-
-namespace Microsoft.Toolkit.HighPerformance.Enumerables
-{
-    /// <summary>
-    /// A <see langword="ref"/> <see langword="struct"/> that iterates items from arbitrary memory locations.
-    /// </summary>
-    /// <typeparam name="T">The type of items to enumerate.</typeparam>
-    public readonly ref struct RefEnumerable<T>
-    {
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// The <see cref="Span{T}"/> instance pointing to the first item in the target memory area.
-        /// </summary>
-        /// <remarks>The <see cref="Span{T}.Length"/> field maps to the total available length.</remarks>
-        internal readonly Span<T> Span;
-#else
-        /// <summary>
-        /// The target <see cref="object"/> instance, if present.
-        /// </summary>
-        internal readonly object? Instance;
-
-        /// <summary>
-        /// The initial offset within <see cref="Instance"/>.
-        /// </summary>
-        internal readonly IntPtr Offset;
-#endif
-
-        /// <summary>
-        /// The distance between items in the sequence to enumerate.
-        /// </summary>
-        /// <remarks>The distance refers to <typeparamref name="T"/> items, not byte offset.</remarks>
-        internal readonly int Step;
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RefEnumerable{T}"/> struct.
-        /// </summary>
-        /// <param name="reference">A reference to the first item of the sequence.</param>
-        /// <param name="length">The number of items in the sequence.</param>
-        /// <param name="step">The distance between items in the sequence to enumerate.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal RefEnumerable(ref T reference, int length, int step)
-        {
-            Span = MemoryMarshal.CreateSpan(ref reference, length);
-            Step = step;
-        }
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="RefEnumerable{T}"/> struct with the specified parameters.
-        /// </summary>
-        /// <param name="value">The reference to the first <typeparamref name="T"/> item to map.</param>
-        /// <param name="length">The number of items in the sequence.</param>
-        /// <param name="step">The distance between items in the sequence to enumerate.</param>
-        /// <returns>A <see cref="RefEnumerable{T}"/> instance with the specified parameters.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when one of the parameters are negative.</exception>
-        [Pure]
-        public static RefEnumerable<T> DangerousCreate(ref T value, int length, int step)
-        {
-            if (length < 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForLength();
-            }
-
-            if (step < 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForStep();
-            }
-
-            OverflowHelper.EnsureIsInNativeIntRange(length, 1, step);
-
-            return new RefEnumerable<T>(ref value, length, step);
-        }
-#else
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RefEnumerable{T}"/> struct.
-        /// </summary>
-        /// <param name="instance">The target <see cref="object"/> instance.</param>
-        /// <param name="offset">The initial offset within <see paramref="instance"/>.</param>
-        /// <param name="length">The number of items in the sequence.</param>
-        /// <param name="step">The distance between items in the sequence to enumerate.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal RefEnumerable(object? instance, IntPtr offset, int length, int step)
-        {
-            Instance = instance;
-            Offset = offset;
-            Length = length;
-            Step = step;
-        }
-#endif
-
-        /// <summary>
-        /// Gets the total available length for the sequence.
-        /// </summary>
-        public int Length
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-#if SPAN_RUNTIME_SUPPORT
-            get => this.Span.Length;
-#else
-            get;
-#endif
-        }
-
-        /// <summary>
-        /// Gets the element at the specified zero-based index.
-        /// </summary>
-        /// <param name="index">The zero-based index of the element.</param>
-        /// <returns>A reference to the element at the specified index.</returns>
-        /// <exception cref="IndexOutOfRangeException">
-        /// Thrown when <paramref name="index"/> is invalid.
-        /// </exception>
-        public ref T this[int index]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                if ((uint)index >= (uint)Length)
-                {
-                    ThrowHelper.ThrowIndexOutOfRangeException();
-                }
-
-#if SPAN_RUNTIME_SUPPORT
-                ref T r0 = ref MemoryMarshal.GetReference(this.Span);
-#else
-                ref T r0 = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.Instance, this.Offset);
-#endif
-                nint offset = (nint)(uint)index * (nint)(uint)this.Step;
-                ref T ri = ref Unsafe.Add(ref r0, offset);
-
-                return ref ri;
-            }
-        }
-
-#if NETSTANDARD2_1_OR_GREATER
-        /// <summary>
-        /// Gets the element at the specified zero-based index.
-        /// </summary>
-        /// <param name="index">The zero-based index of the element.</param>
-        /// <returns>A reference to the element at the specified index.</returns>
-        /// <exception cref="IndexOutOfRangeException">
-        /// Thrown when <paramref name="index"/> is invalid.
-        /// </exception>
-        public ref T this[Index index]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => ref this[index.GetOffset(Length)];
-        }
-#endif
-
-        /// <inheritdoc cref="System.Collections.IEnumerable.GetEnumerator"/>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Enumerator GetEnumerator()
-        {
-#if SPAN_RUNTIME_SUPPORT
-            return new Enumerator(this.Span, this.Step);
-#else
-            return new Enumerator(this.Instance, this.Offset, this.Length, this.Step);
-#endif
-        }
-
-        /// <summary>
-        /// Clears the contents of the current <see cref="RefEnumerable{T}"/> instance.
-        /// </summary>
-        public void Clear()
-        {
-#if SPAN_RUNTIME_SUPPORT
-            // Fast path for contiguous items
-            if (this.Step == 1)
-            {
-                this.Span.Clear();
-
-                return;
-            }
-
-            ref T r0 = ref this.Span.DangerousGetReference();
-            int length = this.Span.Length;
-#else
-            ref T r0 = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.Instance, this.Offset);
-            int length = this.Length;
-#endif
-
-            RefEnumerableHelper.Clear(ref r0, (nint)(uint)length, (nint)(uint)this.Step);
-        }
-
-        /// <summary>
-        /// Copies the contents of this <see cref="RefEnumerable{T}"/> into a destination <see cref="RefEnumerable{T}"/> instance.
-        /// </summary>
-        /// <param name="destination">The destination <see cref="RefEnumerable{T}"/> instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="destination"/> is shorter than the source <see cref="RefEnumerable{T}"/> instance.
-        /// </exception>
-        public void CopyTo(RefEnumerable<T> destination)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            if (this.Step == 1)
-            {
-                destination.CopyFrom(this.Span);
-
-                return;
-            }
-
-            if (destination.Step == 1)
-            {
-                CopyTo(destination.Span);
-
-                return;
-            }
-
-            ref T sourceRef = ref this.Span.DangerousGetReference();
-            ref T destinationRef = ref destination.Span.DangerousGetReference();
-            int
-                sourceLength = this.Span.Length,
-                destinationLength = destination.Span.Length;
-#else
-            ref T sourceRef = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.Instance, this.Offset);
-            ref T destinationRef = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(destination.Instance, destination.Offset);
-            int
-                sourceLength = this.Length,
-                destinationLength = destination.Length;
-#endif
-
-            if ((uint)destinationLength < (uint)sourceLength)
-            {
-                ThrowArgumentExceptionForDestinationTooShort();
-            }
-
-            RefEnumerableHelper.CopyTo(ref sourceRef, ref destinationRef, (nint)(uint)sourceLength, (nint)(uint)this.Step, (nint)(uint)destination.Step);
-        }
-
-        /// <summary>
-        /// Attempts to copy the current <see cref="RefEnumerable{T}"/> instance to a destination <see cref="RefEnumerable{T}"/>.
-        /// </summary>
-        /// <param name="destination">The target <see cref="RefEnumerable{T}"/> of the copy operation.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        public bool TryCopyTo(RefEnumerable<T> destination)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            int
-                sourceLength = this.Span.Length,
-                destinationLength = destination.Span.Length;
-#else
-            int
-                sourceLength = this.Length,
-                destinationLength = destination.Length;
-#endif
-
-            if (destinationLength >= sourceLength)
-            {
-                CopyTo(destination);
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Copies the contents of this <see cref="RefEnumerable{T}"/> into a destination <see cref="Span{T}"/> instance.
-        /// </summary>
-        /// <param name="destination">The destination <see cref="Span{T}"/> instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="destination"/> is shorter than the source <see cref="RefEnumerable{T}"/> instance.
-        /// </exception>
-        public void CopyTo(Span<T> destination)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            if (this.Step == 1)
-            {
-                this.Span.CopyTo(destination);
-
-                return;
-            }
-
-            ref T sourceRef = ref this.Span.DangerousGetReference();
-            int length = this.Span.Length;
-#else
-            ref T sourceRef = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.Instance, this.Offset);
-            int length = this.Length;
-#endif
-            if ((uint)destination.Length < (uint)length)
-            {
-                ThrowArgumentExceptionForDestinationTooShort();
-            }
-
-            ref T destinationRef = ref destination.DangerousGetReference();
-
-            RefEnumerableHelper.CopyTo(ref sourceRef, ref destinationRef, (nint)(uint)length, (nint)(uint)this.Step);
-        }
-
-        /// <summary>
-        /// Attempts to copy the current <see cref="RefEnumerable{T}"/> instance to a destination <see cref="Span{T}"/>.
-        /// </summary>
-        /// <param name="destination">The target <see cref="Span{T}"/> of the copy operation.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        public bool TryCopyTo(Span<T> destination)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            int length = this.Span.Length;
-#else
-            int length = this.Length;
-#endif
-
-            if (destination.Length >= length)
-            {
-                CopyTo(destination);
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Copies the contents of a source <see cref="ReadOnlySpan{T}"/> into the current <see cref="RefEnumerable{T}"/> instance.
-        /// </summary>
-        /// <param name="source">The source <see cref="ReadOnlySpan{T}"/> instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the current <see cref="RefEnumerable{T}"/> is shorter than the source <see cref="ReadOnlySpan{T}"/> instance.
-        /// </exception>
-        internal void CopyFrom(ReadOnlySpan<T> source)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            if (this.Step == 1)
-            {
-                source.CopyTo(this.Span);
-
-                return;
-            }
-
-            ref T destinationRef = ref this.Span.DangerousGetReference();
-            int destinationLength = this.Span.Length;
-#else
-            ref T destinationRef = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.Instance, this.Offset);
-            int destinationLength = this.Length;
-#endif
-            ref T sourceRef = ref source.DangerousGetReference();
-            int sourceLength = source.Length;
-
-            if ((uint)destinationLength < (uint)sourceLength)
-            {
-                ThrowArgumentExceptionForDestinationTooShort();
-            }
-
-            RefEnumerableHelper.CopyFrom(ref sourceRef, ref destinationRef, (nint)(uint)sourceLength, (nint)(uint)this.Step);
-        }
-
-        /// <summary>
-        /// Attempts to copy the source <see cref="ReadOnlySpan{T}"/> into the current <see cref="RefEnumerable{T}"/> instance.
-        /// </summary>
-        /// <param name="source">The source <see cref="ReadOnlySpan{T}"/> instance.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        public bool TryCopyFrom(ReadOnlySpan<T> source)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            int length = this.Span.Length;
-#else
-            int length = this.Length;
-#endif
-
-            if (length >= source.Length)
-            {
-                CopyFrom(source);
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Fills the elements of this <see cref="RefEnumerable{T}"/> with a specified value.
-        /// </summary>
-        /// <param name="value">The value to assign to each element of the <see cref="RefEnumerable{T}"/> instance.</param>
-        public void Fill(T value)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            if (this.Step == 1)
-            {
-                this.Span.Fill(value);
-
-                return;
-            }
-
-            ref T r0 = ref this.Span.DangerousGetReference();
-            int length = this.Span.Length;
-#else
-            ref T r0 = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.Instance, this.Offset);
-            int length = this.Length;
-#endif
-
-            RefEnumerableHelper.Fill(ref r0, (nint)(uint)length, (nint)(uint)this.Step, value);
-        }
-
-        /// <summary>
-        /// Returns a <typeparamref name="T"/> array with the values in the target row.
-        /// </summary>
-        /// <returns>A <typeparamref name="T"/> array with the values in the target row.</returns>
-        /// <remarks>
-        /// This method will allocate a new <typeparamref name="T"/> array, so only
-        /// use it if you really need to copy the target items in a new memory location.
-        /// </remarks>
-        [Pure]
-        public T[] ToArray()
-        {
-#if SPAN_RUNTIME_SUPPORT
-            int length = this.Span.Length;
-#else
-            int length = this.Length;
-#endif
-
-            // Empty array if no data is mapped
-            if (length == 0)
-            {
-                return Array.Empty<T>();
-            }
-
-            T[] array = new T[length];
-
-            CopyTo(array);
-
-            return array;
-        }
-
-        /// <summary>
-        /// A custom enumerator type to traverse items within a <see cref="RefEnumerable{T}"/> instance.
-        /// </summary>
-        public ref struct Enumerator
-        {
-#if SPAN_RUNTIME_SUPPORT
-            /// <inheritdoc cref="RefEnumerable{T}.Span"/>
-            private readonly Span<T> span;
-#else
-            /// <inheritdoc cref="RefEnumerable{T}.Instance"/>
-            private readonly object? instance;
-
-            /// <inheritdoc cref="RefEnumerable{T}.Offset"/>
-            private readonly IntPtr offset;
-
-            /// <inheritdoc cref="RefEnumerable{T}.Length"/>
-            private readonly int length;
-#endif
-
-            /// <inheritdoc cref="RefEnumerable{T}.Step"/>
-            private readonly int step;
-
-            /// <summary>
-            /// The current position in the sequence.
-            /// </summary>
-            private int position;
-
-#if SPAN_RUNTIME_SUPPORT
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Enumerator"/> struct.
-            /// </summary>
-            /// <param name="span">The <see cref="Span{T}"/> instance with the info on the items to traverse.</param>
-            /// <param name="step">The distance between items in the sequence to enumerate.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            internal Enumerator(Span<T> span, int step)
-            {
-                this.span = span;
-                this.step = step;
-                this.position = -1;
-            }
-#else
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Enumerator"/> struct.
-            /// </summary>
-            /// <param name="instance">The target <see cref="object"/> instance.</param>
-            /// <param name="offset">The initial offset within <see paramref="instance"/>.</param>
-            /// <param name="length">The number of items in the sequence.</param>
-            /// <param name="step">The distance between items in the sequence to enumerate.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            internal Enumerator(object? instance, IntPtr offset, int length, int step)
-            {
-                this.instance = instance;
-                this.offset = offset;
-                this.length = length;
-                this.step = step;
-                this.position = -1;
-            }
-#endif
-
-            /// <inheritdoc cref="System.Collections.IEnumerator.MoveNext"/>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public bool MoveNext()
-            {
-#if SPAN_RUNTIME_SUPPORT
-                return ++this.position < this.span.Length;
-#else
-                return ++this.position < this.length;
-#endif
-            }
-
-            /// <inheritdoc cref="System.Collections.Generic.IEnumerator{T}.Current"/>
-            public readonly ref T Current
-            {
-                [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get
-                {
-#if SPAN_RUNTIME_SUPPORT
-                    ref T r0 = ref this.span.DangerousGetReference();
-#else
-                    ref T r0 = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.instance, this.offset);
-#endif
-
-                    // Here we just offset by shifting down as if we were traversing a 2D array with a
-                    // a single column, with the width of each row represented by the step, the height
-                    // represented by the current position, and with only the first element of each row
-                    // being inspected. We can perform all the indexing operations in this type as nint,
-                    // as the maximum offset is guaranteed never to exceed the maximum value, since on
-                    // 32 bit architectures it's not possible to allocate that much memory anyway.
-                    nint offset = (nint)(uint)this.position * (nint)(uint)this.step;
-                    ref T ri = ref Unsafe.Add(ref r0, offset);
-
-                    return ref ri;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "length" parameter is invalid.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForLength()
-        {
-            throw new ArgumentOutOfRangeException("length");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "step" parameter is invalid.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForStep()
-        {
-            throw new ArgumentOutOfRangeException("step");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when the target span is too short.
-        /// </summary>
-        private static void ThrowArgumentExceptionForDestinationTooShort()
-        {
-            throw new ArgumentException("The target span is too short to copy all the current items to");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
deleted file mode 100644
index 059e7d5d7e4..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanEnumerable{T}.cs
+++ /dev/null
@@ -1,162 +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.ComponentModel;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.Toolkit.HighPerformance.Enumerables
-{
-    /// <summary>
-    /// A <see langword="ref"/> <see langword="struct"/> that enumerates the items in a given <see cref="Span{T}"/> instance.
-    /// </summary>
-    /// <typeparam name="T">The type of items to enumerate.</typeparam>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public ref struct SpanEnumerable<T>
-    {
-        /// <summary>
-        /// The source <see cref="Span{T}"/> instance.
-        /// </summary>
-        private readonly Span<T> span;
-
-        /// <summary>
-        /// The current index within <see cref="span"/>.
-        /// </summary>
-        private int index;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SpanEnumerable{T}"/> struct.
-        /// </summary>
-        /// <param name="span">The source <see cref="Span{T}"/> instance.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public SpanEnumerable(Span<T> span)
-        {
-            this.span = span;
-            this.index = -1;
-        }
-
-        /// <summary>
-        /// 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;
-
-        /// <summary>
-        /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
-        /// </summary>
-        /// <returns><see langword="true"/> whether a new element is available, <see langword="false"/> otherwise</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool MoveNext()
-        {
-            return ++this.index < this.span.Length;
-        }
-
-        /// <summary>
-        /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
-        /// </summary>
-        public readonly Item Current
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-#if SPAN_RUNTIME_SUPPORT
-                ref T r0 = ref MemoryMarshal.GetReference(this.span);
-                ref T ri = ref Unsafe.Add(ref r0, (nint)(uint)this.index);
-
-                // 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);
-#endif
-            }
-        }
-
-        /// <summary>
-        /// An item from a source <see cref="Span{T}"/> instance.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public readonly ref struct Item
-        {
-            /// <summary>
-            /// The source <see cref="Span{T}"/> instance.
-            /// </summary>
-            private readonly Span<T> span;
-
-#if SPAN_RUNTIME_SUPPORT
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Item"/> struct.
-            /// </summary>
-            /// <param name="value">A reference to the target value.</param>
-            /// <param name="index">The index of the target value.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Item(ref T value, int index)
-            {
-                this.span = MemoryMarshal.CreateSpan(ref value, index);
-            }
-#else
-            /// <summary>
-            /// The current index within <see cref="span"/>.
-            /// </summary>
-            private readonly int index;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Item"/> struct.
-            /// </summary>
-            /// <param name="span">The source <see cref="Span{T}"/> instance.</param>
-            /// <param name="index">The current index within <paramref name="span"/>.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Item(Span<T> span, int index)
-            {
-                this.span = span;
-                this.index = index;
-            }
-#endif
-
-            /// <summary>
-            /// Gets the reference to the current value.
-            /// </summary>
-            public ref T Value
-            {
-                [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get
-                {
-#if SPAN_RUNTIME_SUPPORT
-                    return ref MemoryMarshal.GetReference(this.span);
-#else
-                    ref T r0 = ref MemoryMarshal.GetReference(this.span);
-                    ref T ri = ref Unsafe.Add(ref r0, (nint)(uint)this.index);
-
-                    return ref ri;
-#endif
-                }
-            }
-
-            /// <summary>
-            /// Gets the current index.
-            /// </summary>
-            public int Index
-            {
-                [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get
-                {
-#if SPAN_RUNTIME_SUPPORT
-                    return this.span.Length;
-#else
-                    return this.index;
-#endif
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs
deleted file mode 100644
index d795c9e4cc6..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Enumerables/SpanTokenizer{T}.cs
+++ /dev/null
@@ -1,106 +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.ComponentModel;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.HighPerformance.Enumerables
-{
-    /// <summary>
-    /// A <see langword="ref"/> <see langword="struct"/> that tokenizes a given <see cref="Span{T}"/> instance.
-    /// </summary>
-    /// <typeparam name="T">The type of items to enumerate.</typeparam>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public ref struct SpanTokenizer<T>
-        where T : IEquatable<T>
-    {
-        /// <summary>
-        /// The source <see cref="Span{T}"/> instance.
-        /// </summary>
-        private readonly Span<T> span;
-
-        /// <summary>
-        /// The separator item to use.
-        /// </summary>
-        private readonly T separator;
-
-        /// <summary>
-        /// The current initial offset.
-        /// </summary>
-        private int start;
-
-        /// <summary>
-        /// The current final offset.
-        /// </summary>
-        private int end;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SpanTokenizer{T}"/> struct.
-        /// </summary>
-        /// <param name="span">The source <see cref="Span{T}"/> instance.</param>
-        /// <param name="separator">The separator item to use.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public SpanTokenizer(Span<T> span, T separator)
-        {
-            this.span = span;
-            this.separator = separator;
-            this.start = 0;
-            this.end = -1;
-        }
-
-        /// <summary>
-        /// 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;
-
-        /// <summary>
-        /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
-        /// </summary>
-        /// <returns><see langword="true"/> whether a new element is available, <see langword="false"/> otherwise</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool MoveNext()
-        {
-            int
-                newEnd = this.end + 1,
-                length = this.span.Length;
-
-            // Additional check if the separator is not the last character
-            if (newEnd <= length)
-            {
-                this.start = newEnd;
-
-                int index = this.span.Slice(newEnd).IndexOf(this.separator);
-
-                // Extract the current subsequence
-                if (index >= 0)
-                {
-                    this.end = newEnd + index;
-
-                    return true;
-                }
-
-                this.end = length;
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Gets the duck-typed <see cref="IEnumerator{T}.Current"/> property.
-        /// </summary>
-        public readonly Span<T> Current
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.span.Slice(this.start, this.end - this.start);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.1D.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.1D.cs
deleted file mode 100644
index c4d845ef6ec..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.1D.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.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-#if NETCORE_RUNTIME || NET5_0
-using System.Runtime.InteropServices;
-#endif
-using Microsoft.Toolkit.HighPerformance.Enumerables;
-#if !NETCORE_RUNTIME && !NET5_0
-using Microsoft.Toolkit.HighPerformance.Helpers;
-#endif
-using Microsoft.Toolkit.HighPerformance.Helpers.Internals;
-using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="Array"/> type.
-    /// </summary>
-    public static partial class ArrayExtensions
-    {
-        /// <summary>
-        /// Returns a reference to the first element within a given <typeparamref name="T"/> array, with no bounds checks.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input <typeparamref name="T"/> array instance.</param>
-        /// <returns>A reference to the first element within <paramref name="array"/>, or the location it would have used, if <paramref name="array"/> is empty.</returns>
-        /// <remarks>This method doesn't do any bounds checks, therefore it is responsibility of the caller to perform checks in case the returned value is dereferenced.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T DangerousGetReference<T>(this T[] array)
-        {
-#if NET5_0
-            return ref MemoryMarshal.GetArrayDataReference(array);
-#elif NETCORE_RUNTIME
-            var arrayData = Unsafe.As<RawArrayData>(array)!;
-            ref T r0 = ref Unsafe.As<byte, T>(ref arrayData.Data);
-
-            return ref r0;
-#else
-            IntPtr offset = RuntimeHelpers.GetArrayDataByteOffset<T>();
-
-            return ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(array, offset);
-#endif
-        }
-
-        /// <summary>
-        /// Returns a reference to an element at a specified index within a given <typeparamref name="T"/> array, with no bounds checks.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input <typeparamref name="T"/> array instance.</param>
-        /// <param name="i">The index of the element to retrieve within <paramref name="array"/>.</param>
-        /// <returns>A reference to the element within <paramref name="array"/> at the index specified by <paramref name="i"/>.</returns>
-        /// <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)
-        {
-#if NET5_0
-            ref T r0 = ref MemoryMarshal.GetArrayDataReference(array);
-            ref T ri = ref Unsafe.Add(ref r0, (nint)(uint)i);
-
-            return ref ri;
-#elif 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, (nint)(uint)i);
-
-            return ref ri;
-#else
-            IntPtr offset = RuntimeHelpers.GetArrayDataByteOffset<T>();
-            ref T r0 = ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(array, offset);
-            ref T ri = ref Unsafe.Add(ref r0, (nint)(uint)i);
-
-            return ref ri;
-#endif
-        }
-
-#if NETCORE_RUNTIME
-        // Description taken from CoreCLR: see https://source.dot.net/#System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.CoreCLR.cs,285.
-        // CLR arrays are laid out in memory as follows (multidimensional array bounds are optional):
-        // [ sync block || pMethodTable || num components || MD array bounds || array data .. ]
-        //                 ^                                 ^                  ^ returned reference
-        //                 |                                 \-- ref Unsafe.As<RawArrayData>(array).Data
-        //                 \-- array
-        // The base size of an array includes all the fields before the array data,
-        // including the sync block and method table. The reference to RawData.Data
-        // points at the number of components, skipping over these two pointer-sized fields.
-        [StructLayout(LayoutKind.Sequential)]
-        private sealed class RawArrayData
-        {
-#pragma warning disable CS0649 // Unassigned fields
-#pragma warning disable SA1401 // Fields should be private
-            public IntPtr Length;
-            public byte Data;
-#pragma warning restore CS0649
-#pragma warning restore SA1401
-        }
-#endif
-
-        /// <summary>
-        /// Counts the number of occurrences of a given value into a target <typeparamref name="T"/> array instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input <typeparamref name="T"/> array instance.</param>
-        /// <param name="value">The <typeparamref name="T"/> value to look for.</param>
-        /// <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)
-            where T : IEquatable<T>
-        {
-            ref T r0 = ref array.DangerousGetReference();
-            nint
-                length = RuntimeHelpers.GetArrayNativeLength(array),
-                count = SpanHelper.Count(ref r0, length, value);
-
-            if ((nuint)count > int.MaxValue)
-            {
-                ThrowOverflowException();
-            }
-
-            return (int)count;
-        }
-
-        /// <summary>
-        /// Enumerates the items in the input <typeparamref name="T"/> array instance, as pairs of reference/index values.
-        /// This extension should be used directly within a <see langword="foreach"/> loop:
-        /// <code>
-        /// int[] numbers = new[] { 1, 2, 3, 4, 5, 6, 7 };
-        ///
-        /// foreach (var item in numbers.Enumerate())
-        /// {
-        ///     // Access the index and value of each item here...
-        ///     int index = item.Index;
-        ///     ref int value = ref item.Value;
-        /// }
-        /// </code>
-        /// The compiler will take care of properly setting up the <see langword="foreach"/> loop with the type returned from this method.
-        /// </summary>
-        /// <typeparam name="T">The type of items to enumerate.</typeparam>
-        /// <param name="array">The source <typeparamref name="T"/> array to enumerate.</param>
-        /// <returns>A wrapper type that will handle the reference/index enumeration for <paramref name="array"/>.</returns>
-        /// <remarks>The returned <see cref="SpanEnumerable{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static SpanEnumerable<T> Enumerate<T>(this T[] array)
-        {
-            return new(array);
-        }
-
-        /// <summary>
-        /// Tokenizes the values in the input <typeparamref name="T"/> array instance using a specified separator.
-        /// This extension should be used directly within a <see langword="foreach"/> loop:
-        /// <code>
-        /// char[] text = "Hello, world!".ToCharArray();
-        ///
-        /// foreach (var token in text.Tokenize(','))
-        /// {
-        ///     // Access the tokens here...
-        /// }
-        /// </code>
-        /// The compiler will take care of properly setting up the <see langword="foreach"/> loop with the type returned from this method.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the <typeparamref name="T"/> array to tokenize.</typeparam>
-        /// <param name="array">The source <typeparamref name="T"/> array to tokenize.</param>
-        /// <param name="separator">The separator <typeparamref name="T"/> item to use.</param>
-        /// <returns>A wrapper type that will handle the tokenization for <paramref name="array"/>.</returns>
-        /// <remarks>The returned <see cref="SpanTokenizer{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static SpanTokenizer<T> Tokenize<T>(this T[] array, T separator)
-            where T : IEquatable<T>
-        {
-            return new(array, separator);
-        }
-
-        /// <summary>
-        /// Gets a content hash from the input <typeparamref name="T"/> array instance using the Djb2 algorithm.
-        /// For more info, see the documentation for <see cref="ReadOnlySpanExtensions.GetDjb2HashCode{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input <typeparamref name="T"/> array instance.</param>
-        /// <returns>The Djb2 value for the input <typeparamref name="T"/> array instance.</returns>
-        /// <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)
-            where T : notnull
-        {
-            ref T r0 = ref array.DangerousGetReference();
-            nint length = RuntimeHelpers.GetArrayNativeLength(array);
-
-            return SpanHelper.GetDjb2HashCode(ref r0, length);
-        }
-
-        /// <summary>
-        /// Checks whether or not a given <typeparamref name="T"/> array is covariant.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input <typeparamref name="T"/> array instance.</param>
-        /// <returns>Whether or not <paramref name="array"/> is covariant.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool IsCovariant<T>(this T[] array)
-        {
-            return default(T) is null && array.GetType() != typeof(T[]);
-        }
-
-        /// <summary>
-        /// Throws an <see cref="OverflowException"/> when the "column" parameter is invalid.
-        /// </summary>
-        private static void ThrowOverflowException()
-        {
-            throw new OverflowException();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs
deleted file mode 100644
index 4ac006aac20..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs
+++ /dev/null
@@ -1,467 +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;
-#if SPAN_RUNTIME_SUPPORT
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Buffers.Internals;
-#endif
-using Microsoft.Toolkit.HighPerformance.Enumerables;
-using Microsoft.Toolkit.HighPerformance.Helpers;
-using Microsoft.Toolkit.HighPerformance.Helpers.Internals;
-using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="Array"/> type.
-    /// </summary>
-    public static partial class ArrayExtensions
-    {
-        /// <summary>
-        /// Returns a reference to the first element within a given 2D <typeparamref name="T"/> array, with no bounds checks.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input 2D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input <typeparamref name="T"/> array instance.</param>
-        /// <returns>A reference to the first element within <paramref name="array"/>, or the location it would have used, if <paramref name="array"/> is empty.</returns>
-        /// <remarks>This method doesn't do any bounds checks, therefore it is responsibility of the caller to perform checks in case the returned value is dereferenced.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T DangerousGetReference<T>(this T[,] array)
-        {
-#if NETCORE_RUNTIME
-            var arrayData = Unsafe.As<RawArray2DData>(array)!;
-            ref T r0 = ref Unsafe.As<byte, T>(ref arrayData.Data);
-
-            return ref r0;
-#else
-            IntPtr offset = RuntimeHelpers.GetArray2DDataByteOffset<T>();
-
-            return ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(array, offset);
-#endif
-        }
-
-        /// <summary>
-        /// Returns a reference to an element at a specified coordinate within a given 2D <typeparamref name="T"/> array, with no bounds checks.
-        /// </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>
-        /// <param name="i">The vertical index of the element to retrieve within <paramref name="array"/>.</param>
-        /// <param name="j">The horizontal index of the element to retrieve within <paramref name="array"/>.</param>
-        /// <returns>A reference to the element within <paramref name="array"/> at the coordinate specified by <paramref name="i"/> and <paramref name="j"/>.</returns>
-        /// <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 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]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T DangerousGetReferenceAt<T>(this T[,] array, int i, int j)
-        {
-#if NETCORE_RUNTIME
-            var arrayData = Unsafe.As<RawArray2DData>(array)!;
-            nint offset = ((nint)(uint)i * (nint)(uint)arrayData.Width) + (nint)(uint)j;
-            ref T r0 = ref Unsafe.As<byte, T>(ref arrayData.Data);
-            ref T ri = ref Unsafe.Add(ref r0, offset);
-
-            return ref ri;
-#else
-            int width = array.GetLength(1);
-            nint index = ((nint)(uint)i * (nint)(uint)width) + (nint)(uint)j;
-            IntPtr offset = RuntimeHelpers.GetArray2DDataByteOffset<T>();
-            ref T r0 = ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(array, offset);
-            ref T ri = ref Unsafe.Add(ref r0, index);
-
-            return ref ri;
-#endif
-        }
-
-#if NETCORE_RUNTIME
-        // Description adapted from CoreCLR: see https://source.dot.net/#System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.CoreCLR.cs,285.
-        // CLR 2D arrays are laid out in memory as follows:
-        // [ sync block || pMethodTable || Length (padded to IntPtr) || HxW || HxW bounds || array data .. ]
-        //                 ^                                                                 ^
-        //                 |                                                                 \-- ref Unsafe.As<RawArray2DData>(array).Data
-        //                 \-- array
-        // The length is always padded to IntPtr just like with SZ arrays.
-        // The total data padding is therefore 20 bytes on x86 (4 + 4 + 4 + 4 + 4), or 24 bytes on x64.
-        [StructLayout(LayoutKind.Sequential)]
-        private sealed class RawArray2DData
-        {
-#pragma warning disable CS0649 // Unassigned fields
-#pragma warning disable SA1401 // Fields should be private
-            public IntPtr Length;
-            public int Height;
-            public int Width;
-            public int HeightLowerBound;
-            public int WidthLowerBound;
-            public byte Data;
-#pragma warning restore CS0649
-#pragma warning restore SA1401
-        }
-#endif
-
-        /// <summary>
-        /// Returns a <see cref="RefEnumerable{T}"/> over a row in a given 2D <typeparamref name="T"/> array instance.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input 2D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input <typeparamref name="T"/> array instance.</param>
-        /// <param name="row">The target row to retrieve (0-based index).</param>
-        /// <returns>A <see cref="RefEnumerable{T}"/> with the items from the target row within <paramref name="array"/>.</returns>
-        /// <remarks>The returned <see cref="RefEnumerable{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when one of the input parameters is out of range.</exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static RefEnumerable<T> GetRow<T>(this T[,] array, int row)
-        {
-            if (array.IsCovariant())
-            {
-                ThrowArrayTypeMismatchException();
-            }
-
-            int height = array.GetLength(0);
-
-            if ((uint)row >= (uint)height)
-            {
-                ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            int width = array.GetLength(1);
-
-#if SPAN_RUNTIME_SUPPORT
-            ref T r0 = ref array.DangerousGetReferenceAt(row, 0);
-
-            return new RefEnumerable<T>(ref r0, width, 1);
-#else
-            ref T r0 = ref array.DangerousGetReferenceAt(row, 0);
-            IntPtr offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref r0);
-
-            return new RefEnumerable<T>(array, offset, width, 1);
-#endif
-        }
-
-        /// <summary>
-        /// Returns a <see cref="RefEnumerable{T}"/> that returns the items from a given column in a given 2D <typeparamref name="T"/> array instance.
-        /// This extension should be used directly within a <see langword="foreach"/> loop:
-        /// <code>
-        /// int[,] matrix =
-        /// {
-        ///     { 1, 2, 3 },
-        ///     { 4, 5, 6 },
-        ///     { 7, 8, 9 }
-        /// };
-        ///
-        /// foreach (ref int number in matrix.GetColumn(1))
-        /// {
-        ///     // Access the current number by reference here...
-        /// }
-        /// </code>
-        /// The compiler will take care of properly setting up the <see langword="foreach"/> loop with the type returned from this method.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input 2D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input <typeparamref name="T"/> array instance.</param>
-        /// <param name="column">The target column to retrieve (0-based index).</param>
-        /// <returns>A wrapper type that will handle the column enumeration for <paramref name="array"/>.</returns>
-        /// <remarks>The returned <see cref="RefEnumerable{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when one of the input parameters is out of range.</exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static RefEnumerable<T> GetColumn<T>(this T[,] array, int column)
-        {
-            if (array.IsCovariant())
-            {
-                ThrowArrayTypeMismatchException();
-            }
-
-            int width = array.GetLength(1);
-
-            if ((uint)column >= (uint)width)
-            {
-                ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            int height = array.GetLength(0);
-
-#if SPAN_RUNTIME_SUPPORT
-            ref T r0 = ref array.DangerousGetReferenceAt(0, column);
-
-            return new RefEnumerable<T>(ref r0, height, width);
-#else
-            ref T r0 = ref array.DangerousGetReferenceAt(0, column);
-            IntPtr offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref r0);
-
-            return new RefEnumerable<T>(array, offset, height, width);
-#endif
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="Span2D{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>
-        /// <returns>A <see cref="Span2D{T}"/> instance with the values of <paramref name="array"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span2D<T> AsSpan2D<T>(this T[,]? array)
-        {
-            return new(array);
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="Span2D{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>
-        /// <param name="row">The target row to map within <paramref name="array"/>.</param>
-        /// <param name="column">The target column to map within <paramref name="array"/>.</param>
-        /// <param name="height">The height to map within <paramref name="array"/>.</param>
-        /// <param name="width">The width to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/>, <paramref name="width"/> or <paramref name="height"/>
-        /// are negative or not within the bounds that are valid for <paramref name="array"/>.
-        /// </exception>
-        /// <returns>A <see cref="Span2D{T}"/> instance with the values of <paramref name="array"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span2D<T> AsSpan2D<T>(this T[,]? array, int row, int column, int height, int width)
-        {
-            return new(array, row, column, height, width);
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="Memory2D{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>
-        /// <returns>A <see cref="Memory2D{T}"/> instance with the values of <paramref name="array"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Memory2D<T> AsMemory2D<T>(this T[,]? array)
-        {
-            return new(array);
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="Memory2D{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>
-        /// <param name="row">The target row to map within <paramref name="array"/>.</param>
-        /// <param name="column">The target column to map within <paramref name="array"/>.</param>
-        /// <param name="height">The height to map within <paramref name="array"/>.</param>
-        /// <param name="width">The width to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/>, <paramref name="width"/> or <paramref name="height"/>
-        /// are negative or not within the bounds that are valid for <paramref name="array"/>.
-        /// </exception>
-        /// <returns>A <see cref="Memory2D{T}"/> instance with the values of <paramref name="array"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Memory2D<T> AsMemory2D<T>(this T[,]? array, int row, int column, int height, int width)
-        {
-            return new(array, row, column, height, width);
-        }
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Returns a <see cref="Span{T}"/> over a row in a given 2D <typeparamref name="T"/> array instance.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input 2D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input <typeparamref name="T"/> array instance.</param>
-        /// <param name="row">The target row to retrieve (0-based index).</param>
-        /// <returns>A <see cref="Span{T}"/> with the items from the target row within <paramref name="array"/>.</returns>
-        /// <exception cref="ArrayTypeMismatchException">Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.</exception>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="row"/> is invalid.</exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span<T> GetRowSpan<T>(this T[,] array, int row)
-        {
-            if (array.IsCovariant())
-            {
-                ThrowArrayTypeMismatchException();
-            }
-
-            if ((uint)row >= (uint)array.GetLength(0))
-            {
-                ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            ref T r0 = ref array.DangerousGetReferenceAt(row, 0);
-
-            return MemoryMarshal.CreateSpan(ref r0, array.GetLength(1));
-        }
-
-        /// <summary>
-        /// Returns a <see cref="Memory{T}"/> over a row in a given 2D <typeparamref name="T"/> array instance.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input 2D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input <typeparamref name="T"/> array instance.</param>
-        /// <param name="row">The target row to retrieve (0-based index).</param>
-        /// <returns>A <see cref="Memory{T}"/> with the items from the target row within <paramref name="array"/>.</returns>
-        /// <exception cref="ArrayTypeMismatchException">Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.</exception>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="row"/> is invalid.</exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Memory<T> GetRowMemory<T>(this T[,] array, int row)
-        {
-            if (array.IsCovariant())
-            {
-                ThrowArrayTypeMismatchException();
-            }
-
-            if ((uint)row >= (uint)array.GetLength(0))
-            {
-                ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            ref T r0 = ref array.DangerousGetReferenceAt(row, 0);
-            IntPtr offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref r0);
-
-            return new RawObjectMemoryManager<T>(array, offset, array.GetLength(1)).Memory;
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="Memory{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>
-        /// <returns>A <see cref="Memory{T}"/> instance with the values of <paramref name="array"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Memory<T> AsMemory<T>(this T[,]? array)
-        {
-            if (array is null)
-            {
-                return default;
-            }
-
-            if (array.IsCovariant())
-            {
-                ThrowArrayTypeMismatchException();
-            }
-
-            IntPtr offset = RuntimeHelpers.GetArray2DDataByteOffset<T>();
-            int length = array.Length;
-
-            return new RawObjectMemoryManager<T>(array, offset, length).Memory;
-        }
-
-        /// <summary>
-        /// 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>
-        /// <returns>A <see cref="Span{T}"/> instance with the values of <paramref name="array"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span<T> AsSpan<T>(this T[,]? array)
-        {
-            if (array is null)
-            {
-                return default;
-            }
-
-            if (array.IsCovariant())
-            {
-                ThrowArrayTypeMismatchException();
-            }
-
-            ref T r0 = ref array.DangerousGetReference();
-            int length = array.Length;
-
-            return MemoryMarshal.CreateSpan(ref r0, length);
-        }
-#endif
-
-        /// <summary>
-        /// Counts the number of occurrences of a given value into a target 2D <typeparamref name="T"/> array instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input 2D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input 2D <typeparamref name="T"/> array instance.</param>
-        /// <param name="value">The <typeparamref name="T"/> value to look for.</param>
-        /// <returns>The number of occurrences of <paramref name="value"/> in <paramref name="array"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe int Count<T>(this T[,] array, T value)
-            where T : IEquatable<T>
-        {
-            ref T r0 = ref array.DangerousGetReference();
-            nint
-                length = RuntimeHelpers.GetArrayNativeLength(array),
-                count = SpanHelper.Count(ref r0, length, value);
-
-            if ((nuint)count > int.MaxValue)
-            {
-                ThrowOverflowException();
-            }
-
-            return (int)count;
-        }
-
-        /// <summary>
-        /// Gets a content hash from the input 2D <typeparamref name="T"/> array instance using the Djb2 algorithm.
-        /// For more info, see the documentation for <see cref="ReadOnlySpanExtensions.GetDjb2HashCode{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input 2D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input 2D <typeparamref name="T"/> array instance.</param>
-        /// <returns>The Djb2 value for the input 2D <typeparamref name="T"/> array instance.</returns>
-        /// <remarks>The Djb2 hash is fully deterministic and with no random components.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe int GetDjb2HashCode<T>(this T[,] array)
-            where T : notnull
-        {
-            ref T r0 = ref array.DangerousGetReference();
-            nint length = RuntimeHelpers.GetArrayNativeLength(array);
-
-            return SpanHelper.GetDjb2HashCode(ref r0, length);
-        }
-
-        /// <summary>
-        /// Checks whether or not a given <typeparamref name="T"/> array is covariant.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input <typeparamref name="T"/> array instance.</param>
-        /// <returns>Whether or not <paramref name="array"/> is covariant.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool IsCovariant<T>(this T[,] array)
-        {
-            return default(T) is null && array.GetType() != typeof(T[,]);
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArrayTypeMismatchException"/> when using an array of an invalid type.
-        /// </summary>
-        private static void ThrowArrayTypeMismatchException()
-        {
-            throw new ArrayTypeMismatchException("The given array doesn't match the specified type T");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "row" parameter is invalid.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForRow()
-        {
-            throw new ArgumentOutOfRangeException("row");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "column" parameter is invalid.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForColumn()
-        {
-            throw new ArgumentOutOfRangeException("column");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.3D.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.3D.cs
deleted file mode 100644
index c74f381efa2..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.3D.cs
+++ /dev/null
@@ -1,324 +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;
-using Microsoft.Toolkit.HighPerformance.Helpers;
-#if SPAN_RUNTIME_SUPPORT
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Buffers.Internals;
-#endif
-using Microsoft.Toolkit.HighPerformance.Helpers.Internals;
-using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="Array"/> type.
-    /// </summary>
-    public static partial class ArrayExtensions
-    {
-        /// <summary>
-        /// Returns a reference to the first element within a given 3D <typeparamref name="T"/> array, with no bounds checks.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input 3D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input <typeparamref name="T"/> array instance.</param>
-        /// <returns>A reference to the first element within <paramref name="array"/>, or the location it would have used, if <paramref name="array"/> is empty.</returns>
-        /// <remarks>This method doesn't do any bounds checks, therefore it is responsibility of the caller to perform checks in case the returned value is dereferenced.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T DangerousGetReference<T>(this T[,,] array)
-        {
-#if NETCORE_RUNTIME
-            var arrayData = Unsafe.As<RawArray3DData>(array)!;
-            ref T r0 = ref Unsafe.As<byte, T>(ref arrayData.Data);
-
-            return ref r0;
-#else
-            IntPtr offset = RuntimeHelpers.GetArray3DDataByteOffset<T>();
-
-            return ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(array, offset);
-#endif
-        }
-
-        /// <summary>
-        /// Returns a reference to an element at a specified coordinate within a given 3D <typeparamref name="T"/> array, with no bounds checks.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input 3D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input 2D <typeparamref name="T"/> array instance.</param>
-        /// <param name="i">The depth index of the element to retrieve within <paramref name="array"/>.</param>
-        /// <param name="j">The vertical index of the element to retrieve within <paramref name="array"/>.</param>
-        /// <param name="k">The horizontal index of the element to retrieve within <paramref name="array"/>.</param>
-        /// <returns>A reference to the element within <paramref name="array"/> at the coordinate specified by <paramref name="i"/> and <paramref name="j"/>.</returns>
-        /// <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 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]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T DangerousGetReferenceAt<T>(this T[,,] array, int i, int j, int k)
-        {
-#if NETCORE_RUNTIME
-            var arrayData = Unsafe.As<RawArray3DData>(array)!;
-            nint offset =
-                ((nint)(uint)i * (nint)(uint)arrayData.Height * (nint)(uint)arrayData.Width) +
-                ((nint)(uint)j * (nint)(uint)arrayData.Width) + (nint)(uint)k;
-            ref T r0 = ref Unsafe.As<byte, T>(ref arrayData.Data);
-            ref T ri = ref Unsafe.Add(ref r0, offset);
-
-            return ref ri;
-#else
-            int
-                height = array.GetLength(1),
-                width = array.GetLength(2);
-            nint index =
-                ((nint)(uint)i * (nint)(uint)height * (nint)(uint)width) +
-                ((nint)(uint)j * (nint)(uint)width) + (nint)(uint)k;
-            IntPtr offset = RuntimeHelpers.GetArray3DDataByteOffset<T>();
-            ref T r0 = ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(array, offset);
-            ref T ri = ref Unsafe.Add(ref r0, index);
-
-            return ref ri;
-#endif
-        }
-
-#if NETCORE_RUNTIME
-        // See description for this in the 2D partial file.
-        // Using the CHW naming scheme here (like with RGB images).
-        [StructLayout(LayoutKind.Sequential)]
-        private sealed class RawArray3DData
-        {
-#pragma warning disable CS0649 // Unassigned fields
-#pragma warning disable SA1401 // Fields should be private
-            public IntPtr Length;
-            public int Channel;
-            public int Height;
-            public int Width;
-            public int ChannelLowerBound;
-            public int HeightLowerBound;
-            public int WidthLowerBound;
-            public byte Data;
-#pragma warning restore CS0649
-#pragma warning restore SA1401
-        }
-#endif
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Creates a new <see cref="Memory{T}"/> over an input 3D <typeparamref name="T"/> array.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input 3D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input 3D <typeparamref name="T"/> array instance.</param>
-        /// <returns>A <see cref="Memory{T}"/> instance with the values of <paramref name="array"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Memory<T> AsMemory<T>(this T[,,]? array)
-        {
-            if (array is null)
-            {
-                return default;
-            }
-
-            if (array.IsCovariant())
-            {
-                ThrowArrayTypeMismatchException();
-            }
-
-            IntPtr offset = RuntimeHelpers.GetArray3DDataByteOffset<T>();
-            int length = array.Length;
-
-            return new RawObjectMemoryManager<T>(array, offset, length).Memory;
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="Span{T}"/> over an input 3D <typeparamref name="T"/> array.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input 3D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input 3D <typeparamref name="T"/> array instance.</param>
-        /// <returns>A <see cref="Span{T}"/> instance with the values of <paramref name="array"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span<T> AsSpan<T>(this T[,,]? array)
-        {
-            if (array is null)
-            {
-                return default;
-            }
-
-            if (array.IsCovariant())
-            {
-                ThrowArrayTypeMismatchException();
-            }
-
-            ref T r0 = ref array.DangerousGetReference();
-            int length = array.Length;
-
-            return MemoryMarshal.CreateSpan(ref r0, length);
-        }
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="Span{T}"/> struct wrapping a layer in a 3D array.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input 3D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The given 3D array to wrap.</param>
-        /// <param name="depth">The target layer to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArrayTypeMismatchException">Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.</exception>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="depth"/> is invalid.</exception>
-        /// <returns>A <see cref="Span{T}"/> instance wrapping the target layer within <paramref name="array"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span<T> AsSpan<T>(this T[,,] array, int depth)
-        {
-            if (array.IsCovariant())
-            {
-                ThrowArrayTypeMismatchException();
-            }
-
-            if ((uint)depth >= (uint)array.GetLength(0))
-            {
-                ThrowArgumentOutOfRangeExceptionForDepth();
-            }
-
-            ref T r0 = ref array.DangerousGetReferenceAt(depth, 0, 0);
-            int length = checked(array.GetLength(1) * array.GetLength(2));
-
-            return MemoryMarshal.CreateSpan(ref r0, length);
-        }
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="Memory{T}"/> struct wrapping a layer in a 3D array.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input 3D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The given 3D array to wrap.</param>
-        /// <param name="depth">The target layer to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArrayTypeMismatchException">Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.</exception>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="depth"/> is invalid.</exception>
-        /// <returns>A <see cref="Memory{T}"/> instance wrapping the target layer within <paramref name="array"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Memory<T> AsMemory<T>(this T[,,] array, int depth)
-        {
-            if (array.IsCovariant())
-            {
-                ThrowArrayTypeMismatchException();
-            }
-
-            if ((uint)depth >= (uint)array.GetLength(0))
-            {
-                ThrowArgumentOutOfRangeExceptionForDepth();
-            }
-
-            ref T r0 = ref array.DangerousGetReferenceAt(depth, 0, 0);
-            IntPtr offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref r0);
-            int length = checked(array.GetLength(1) * array.GetLength(2));
-
-            return new RawObjectMemoryManager<T>(array, offset, length).Memory;
-        }
-#endif
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="Span2D{T}"/> struct wrapping a layer in a 3D array.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input 3D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The given 3D array to wrap.</param>
-        /// <param name="depth">The target layer to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentException">Thrown when either <paramref name="depth"/> is invalid.</exception>
-        /// <returns>A <see cref="Span2D{T}"/> instance wrapping the target layer within <paramref name="array"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span2D<T> AsSpan2D<T>(this T[,,] array, int depth)
-        {
-            return new(array, depth);
-        }
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="Memory2D{T}"/> struct wrapping a layer in a 3D array.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input 3D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The given 3D array to wrap.</param>
-        /// <param name="depth">The target layer to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentException">Thrown when either <paramref name="depth"/> is invalid.</exception>
-        /// <returns>A <see cref="Memory2D{T}"/> instance wrapping the target layer within <paramref name="array"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Memory2D<T> AsMemory2D<T>(this T[,,] array, int depth)
-        {
-            return new(array, depth);
-        }
-
-        /// <summary>
-        /// Counts the number of occurrences of a given value into a target 3D <typeparamref name="T"/> array instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input 3D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input 3D <typeparamref name="T"/> array instance.</param>
-        /// <param name="value">The <typeparamref name="T"/> value to look for.</param>
-        /// <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)
-            where T : IEquatable<T>
-        {
-            ref T r0 = ref array.DangerousGetReference();
-            nint
-                length = RuntimeHelpers.GetArrayNativeLength(array),
-                count = SpanHelper.Count(ref r0, length, value);
-
-            if ((nuint)count > int.MaxValue)
-            {
-                ThrowOverflowException();
-            }
-
-            return (int)count;
-        }
-
-        /// <summary>
-        /// Gets a content hash from the input 3D <typeparamref name="T"/> array instance using the Djb2 algorithm.
-        /// For more info, see the documentation for <see cref="ReadOnlySpanExtensions.GetDjb2HashCode{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input 3D <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input 3D <typeparamref name="T"/> array instance.</param>
-        /// <returns>The Djb2 value for the input 3D <typeparamref name="T"/> array instance.</returns>
-        /// <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)
-            where T : notnull
-        {
-            ref T r0 = ref array.DangerousGetReference();
-            nint length = RuntimeHelpers.GetArrayNativeLength(array);
-
-            return SpanHelper.GetDjb2HashCode(ref r0, length);
-        }
-
-        /// <summary>
-        /// Checks whether or not a given <typeparamref name="T"/> array is covariant.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <typeparamref name="T"/> array instance.</typeparam>
-        /// <param name="array">The input <typeparamref name="T"/> array instance.</param>
-        /// <returns>Whether or not <paramref name="array"/> is covariant.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool IsCovariant<T>(this T[,,] array)
-        {
-            return default(T) is null && array.GetType() != typeof(T[,,]);
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "depth" parameter is invalid.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForDepth()
-        {
-            throw new ArgumentOutOfRangeException("depth");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolBufferWriterExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolBufferWriterExtensions.cs
deleted file mode 100644
index fdb6f6b08a9..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolBufferWriterExtensions.cs
+++ /dev/null
@@ -1,31 +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.Diagnostics.Contracts;
-using System.IO;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance.Buffers;
-using Microsoft.Toolkit.HighPerformance.Streams;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="ArrayPoolBufferWriter{T}"/> type.
-    /// </summary>
-    public static class ArrayPoolBufferWriterExtensions
-    {
-        /// <summary>
-        /// Returns a <see cref="Stream"/> that can be used to write to a target an <see cref="ArrayPoolBufferWriter{T}"/> of <see cref="byte"/> instance.
-        /// </summary>
-        /// <param name="writer">The target <see cref="ArrayPoolBufferWriter{T}"/> instance.</param>
-        /// <returns>A <see cref="Stream"/> wrapping <paramref name="writer"/> and writing data to its underlying buffer.</returns>
-        /// <remarks>The returned <see cref="Stream"/> can only be written to and does not support seeking.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Stream AsStream(this ArrayPoolBufferWriter<byte> writer)
-        {
-            return new IBufferWriterStream<ArrayBufferWriterOwner>(new ArrayBufferWriterOwner(writer));
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolExtensions.cs
deleted file mode 100644
index e169a880637..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolExtensions.cs
+++ /dev/null
@@ -1,56 +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.Buffers;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="ArrayPool{T}"/> type.
-    /// </summary>
-    public static class ArrayPoolExtensions
-    {
-        /// <summary>
-        /// Changes the number of elements of a rented one-dimensional array to the specified new size.
-        /// </summary>
-        /// <typeparam name="T">The type of items into the target array to resize.</typeparam>
-        /// <param name="pool">The target <see cref="ArrayPool{T}"/> instance to use to resize the array.</param>
-        /// <param name="array">The rented <typeparamref name="T"/> array to resize, or <see langword="null"/> to create a new array.</param>
-        /// <param name="newSize">The size of the new array.</param>
-        /// <param name="clearArray">Indicates whether the contents of the array should be cleared before reuse.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="newSize"/> is less than 0.</exception>
-        /// <remarks>When this method returns, the caller must not use any references to the old array anymore.</remarks>
-        public static void Resize<T>(this ArrayPool<T> pool, ref T[]? array, int newSize, bool clearArray = false)
-        {
-            // If the old array is null, just create a new one with the requested size
-            if (array is null)
-            {
-                array = pool.Rent(newSize);
-
-                return;
-            }
-
-            // If the new size is the same as the current size, do nothing
-            if (array.Length == newSize)
-            {
-                return;
-            }
-
-            // Rent a new array with the specified size, and copy as many items from the current array
-            // as possible to the new array. This mirrors the behavior of the Array.Resize API from
-            // the BCL: if the new size is greater than the length of the current array, copy all the
-            // items from the original array into the new one. Otherwise, copy as many items as possible,
-            // until the new array is completely filled, and ignore the remaining items in the first array.
-            T[] newArray = pool.Rent(newSize);
-            int itemsToCopy = Math.Min(array.Length, newSize);
-
-            Array.Copy(array, 0, newArray, 0, itemsToCopy);
-
-            pool.Return(array, clearArray);
-
-            array = newArray;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/BoolExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/BoolExtensions.cs
deleted file mode 100644
index 62b827f1598..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/BoolExtensions.cs
+++ /dev/null
@@ -1,83 +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;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="bool"/> type.
-    /// </summary>
-    public static class BoolExtensions
-    {
-        /// <summary>
-        /// Converts the given <see cref="bool"/> value into a <see cref="byte"/>.
-        /// </summary>
-        /// <param name="flag">The input value to convert.</param>
-        /// <returns>1 if <paramref name="flag"/> is <see langword="true"/>, 0 otherwise.</returns>
-        /// <remarks>This method does not contain branching instructions.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe byte ToByte(this bool flag)
-        {
-            // Whenever we need to take the address of an argument, we make a local copy first.
-            // This will be removed by the JIT anyway, but it can help produce better codegen and
-            // remove unwanted stack spills if the caller is using constant arguments. This is
-            // because taking the address of an argument can interfere with some of the flow
-            // analysis executed by the JIT, which can in some cases block constant propagation.
-            bool copy = flag;
-
-            return *(byte*)&copy;
-        }
-
-        /// <summary>
-        /// Converts the given <see cref="bool"/> value to an <see cref="int"/> mask with
-        /// all bits representing the value of the input flag (either 0xFFFFFFFF or 0x00000000).
-        /// </summary>
-        /// <param name="flag">The input value to convert.</param>
-        /// <returns>0xFFFFFFFF if <paramref name="flag"/> is <see langword="true"/>, 0x00000000 otherwise.</returns>
-        /// <remarks>
-        /// This method does not contain branching instructions, and it is only guaranteed to work with
-        /// <see cref="bool"/> values being either 0 or 1. Operations producing a <see cref="bool"/> result,
-        /// such as numerical comparisons, always result in a valid value. If the <see cref="bool"/> value is
-        /// produced by fields with a custom <see cref="System.Runtime.InteropServices.FieldOffsetAttribute"/>,
-        /// or by using <see cref="Unsafe.As{T}"/> or other unsafe APIs to directly manipulate the underlying
-        /// data though, it is responsibility of the caller to ensure the validity of the provided value.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe int ToBitwiseMask32(this bool flag)
-        {
-            bool copy = flag;
-            byte rangeFlag = *(byte*)&copy;
-            int
-                negativeFlag = rangeFlag - 1,
-                mask = ~negativeFlag;
-
-            return mask;
-        }
-
-        /// <summary>
-        /// Converts the given <see cref="bool"/> value to a <see cref="long"/> mask with
-        /// all bits representing the value of the input flag (either all 1s or 0s).
-        /// </summary>
-        /// <param name="flag">The input value to convert.</param>
-        /// <returns>All 1s if <paramref name="flag"/> is <see langword="true"/>, all 0s otherwise.</returns>
-        /// <remarks>This method does not contain branching instructions. See additional note in <see cref="ToBitwiseMask32"/>.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe long ToBitwiseMask64(this bool flag)
-        {
-            bool copy = flag;
-            byte rangeFlag = *(byte*)&copy;
-            long
-                negativeFlag = (long)rangeFlag - 1,
-                mask = ~negativeFlag;
-
-            return mask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/HashCodeExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/HashCodeExtensions.cs
deleted file mode 100644
index cb8741062a9..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/HashCodeExtensions.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.
-
-#if !NETSTANDARD1_4
-
-using System;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance.Helpers;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="HashCode"/> type.
-    /// </summary>
-    public static class HashCodeExtensions
-    {
-        /// <summary>
-        /// Adds a sequence of <typeparamref name="T"/> values to the hash code.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="hashCode">The input <see cref="HashCode"/> instance.</param>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Add<T>(ref this HashCode hashCode, ReadOnlySpan<T> span)
-            where T : notnull
-        {
-            int hash = HashCode<T>.CombineValues(span);
-
-            hashCode.Add(hash);
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/IBufferWriterExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/IBufferWriterExtensions.cs
deleted file mode 100644
index 8586be0bfee..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/IBufferWriterExtensions.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;
-using System.Buffers;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Buffers;
-using Microsoft.Toolkit.HighPerformance.Streams;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="IBufferWriter{T}"/> type.
-    /// </summary>
-    public static class IBufferWriterExtensions
-    {
-        /// <summary>
-        /// Returns a <see cref="Stream"/> that can be used to write to a target an <see cref="IBufferWriter{T}"/> of <see cref="byte"/> instance.
-        /// </summary>
-        /// <param name="writer">The target <see cref="IBufferWriter{T}"/> instance.</param>
-        /// <returns>A <see cref="Stream"/> wrapping <paramref name="writer"/> and writing data to its underlying buffer.</returns>
-        /// <remarks>The returned <see cref="Stream"/> can only be written to and does not support seeking.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Stream AsStream(this IBufferWriter<byte> writer)
-        {
-            if (writer.GetType() == typeof(ArrayPoolBufferWriter<byte>))
-            {
-                // If the input writer is of type ArrayPoolBufferWriter<byte>, we can use the type
-                // specific buffer writer owner to let the JIT elide callvirts when accessing it.
-                var internalWriter = Unsafe.As<ArrayPoolBufferWriter<byte>>(writer)!;
-
-                return new IBufferWriterStream<ArrayBufferWriterOwner>(new ArrayBufferWriterOwner(internalWriter));
-            }
-
-            return new IBufferWriterStream<IBufferWriterOwner>(new IBufferWriterOwner(writer));
-        }
-
-        /// <summary>
-        /// Writes a value of a specified type into a target <see cref="IBufferWriter{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of value to write.</typeparam>
-        /// <param name="writer">The target <see cref="IBufferWriter{T}"/> instance to write to.</param>
-        /// <param name="value">The input value to write to <paramref name="writer"/>.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="writer"/> reaches the end.</exception>
-        public static void Write<T>(this IBufferWriter<byte> writer, T value)
-            where T : unmanaged
-        {
-            int length = Unsafe.SizeOf<T>();
-            Span<byte> span = writer.GetSpan(1);
-
-            if (span.Length < length)
-            {
-                ThrowArgumentExceptionForEndOfBuffer();
-            }
-
-            ref byte r0 = ref MemoryMarshal.GetReference(span);
-
-            Unsafe.WriteUnaligned(ref r0, value);
-
-            writer.Advance(length);
-        }
-
-        /// <summary>
-        /// Writes a value of a specified type into a target <see cref="IBufferWriter{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of value to write.</typeparam>
-        /// <param name="writer">The target <see cref="IBufferWriter{T}"/> instance to write to.</param>
-        /// <param name="value">The input value to write to <paramref name="writer"/>.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="writer"/> reaches the end.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Write<T>(this IBufferWriter<T> writer, T value)
-        {
-            Span<T> span = writer.GetSpan(1);
-
-            if (span.Length < 1)
-            {
-                ThrowArgumentExceptionForEndOfBuffer();
-            }
-
-            MemoryMarshal.GetReference(span) = value;
-
-            writer.Advance(1);
-        }
-
-        /// <summary>
-        /// Writes a series of items of a specified type into a target <see cref="IBufferWriter{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of value to write.</typeparam>
-        /// <param name="writer">The target <see cref="IBufferWriter{T}"/> instance to write to.</param>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> to write to <paramref name="writer"/>.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="writer"/> reaches the end.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Write<T>(this IBufferWriter<byte> writer, ReadOnlySpan<T> span)
-            where T : unmanaged
-        {
-            ReadOnlySpan<byte> source = MemoryMarshal.AsBytes(span);
-            Span<byte> destination = writer.GetSpan(source.Length);
-
-            source.CopyTo(destination);
-
-            writer.Advance(source.Length);
-        }
-
-#if !SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Writes a series of items of a specified type into a target <see cref="IBufferWriter{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of value to write.</typeparam>
-        /// <param name="writer">The target <see cref="IBufferWriter{T}"/> instance to write to.</param>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> to write to <paramref name="writer"/>.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="writer"/> reaches the end.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Write<T>(this IBufferWriter<T> writer, ReadOnlySpan<T> span)
-        {
-            Span<T> destination = writer.GetSpan(span.Length);
-
-            span.CopyTo(destination);
-
-            writer.Advance(span.Length);
-        }
-#endif
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when trying to write too many bytes to the target writer.
-        /// </summary>
-        private static void ThrowArgumentExceptionForEndOfBuffer()
-        {
-            throw new ArgumentException("The current buffer writer can't contain the requested input data.");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.cs
deleted file mode 100644
index f5e905d4753..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.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.Buffers;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Runtime.CompilerServices;
-using MemoryStream = Microsoft.Toolkit.HighPerformance.Streams.MemoryStream;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="IMemoryOwner{T}"/> type.
-    /// </summary>
-    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="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>
-        /// <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)
-        {
-            return MemoryStream.Create(memoryOwner);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ListExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ListExtensions.cs
deleted file mode 100644
index 962e3f4a237..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ListExtensions.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.
-
-#if NET5_0
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="List{T}"/> type.
-    /// </summary>
-    public static class ListExtensions
-    {
-        /// <summary>
-        /// Creates a new <see cref="Span{T}"/> over an input <see cref="List{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input <see cref="List{T}"/> instance.</typeparam>
-        /// <param name="list">The input <see cref="List{T}"/> instance.</param>
-        /// <returns>A <see cref="Span{T}"/> instance with the values of <paramref name="list"/>.</returns>
-        /// <remarks>
-        /// Note that the returned <see cref="Span{T}"/> is only guaranteed to be valid as long as the items within
-        /// <paramref name="list"/> are not modified. Doing so might cause the <see cref="List{T}"/> to swap its
-        /// internal buffer, causing the returned <see cref="Span{T}"/> to become out of date. That means that in this
-        /// scenario, the <see cref="Span{T}"/> would end up wrapping an array no longer in use. Always make sure to use
-        /// the returned <see cref="Span{T}"/> while the target <see cref="List{T}"/> is not modified.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span<T> AsSpan<T>(this List<T>? list)
-        {
-            return CollectionsMarshal.AsSpan(list);
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
deleted file mode 100644
index e107cdda6e9..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs
+++ /dev/null
@@ -1,119 +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.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using MemoryStream = Microsoft.Toolkit.HighPerformance.Streams.MemoryStream;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="Memory{T}"/> type.
-    /// </summary>
-    public static class MemoryExtensions
-    {
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Returns a <see cref="Memory2D{T}"/> instance wrapping the underlying data for the given <see cref="Memory{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> instance.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <returns>The resulting <see cref="Memory2D{T}"/> instance.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="memory"/>.
-        /// </exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Memory2D<T> AsMemory2D<T>(this Memory<T> memory, int height, int width)
-        {
-            return new(memory, height, width);
-        }
-
-        /// <summary>
-        /// Returns a <see cref="Memory2D{T}"/> instance wrapping the underlying data for the given <see cref="Memory{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="Memory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> instance.</param>
-        /// <param name="offset">The initial offset within <paramref name="memory"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <returns>The resulting <see cref="Memory2D{T}"/> instance.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="memory"/>.
-        /// </exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Memory2D<T> AsMemory2D<T>(this Memory<T> memory, int offset, int height, int width, int pitch)
-        {
-            return new(memory, offset, height, width, pitch);
-        }
-#endif
-
-        /// <summary>
-        /// Casts a <see cref="Memory{T}"/> of one primitive type <typeparamref name="T"/> to <see cref="Memory{T}"/> of bytes.
-        /// </summary>
-        /// <typeparam name="T">The type if items in the source <see cref="Memory{T}"/>.</typeparam>
-        /// <param name="memory">The source <see cref="Memory{T}"/>, of type <typeparamref name="T"/>.</param>
-        /// <returns>A <see cref="Memory{T}"/> of bytes.</returns>
-        /// <exception cref="OverflowException">
-        /// Thrown if the <see cref="Memory{T}.Length"/> property of the new <see cref="Memory{T}"/> would exceed <see cref="int.MaxValue"/>.
-        /// </exception>
-        /// <exception cref="ArgumentException">Thrown when the data store of <paramref name="memory"/> is not supported.</exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Memory<byte> AsBytes<T>(this Memory<T> memory)
-            where T : unmanaged
-        {
-            return MemoryMarshal.AsMemory(((ReadOnlyMemory<T>)memory).Cast<T, byte>());
-        }
-
-        /// <summary>
-        /// Casts a <see cref="Memory{T}"/> of one primitive type <typeparamref name="TFrom"/> to another primitive type <typeparamref name="TTo"/>.
-        /// </summary>
-        /// <typeparam name="TFrom">The type of items in the source <see cref="Memory{T}"/>.</typeparam>
-        /// <typeparam name="TTo">The type of items in the destination <see cref="Memory{T}"/>.</typeparam>
-        /// <param name="memory">The source <see cref="Memory{T}"/>, of type <typeparamref name="TFrom"/>.</param>
-        /// <returns>A <see cref="Memory{T}"/> of type <typeparamref name="TTo"/></returns>
-        /// <exception cref="ArgumentException">Thrown when the data store of <paramref name="memory"/> is not supported.</exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Memory<TTo> Cast<TFrom, TTo>(this Memory<TFrom> memory)
-            where TFrom : unmanaged
-            where TTo : unmanaged
-        {
-            return MemoryMarshal.AsMemory(((ReadOnlyMemory<TFrom>)memory).Cast<TFrom, TTo>());
-        }
-
-        /// <summary>
-        /// Returns a <see cref="Stream"/> wrapping the contents of the given <see cref="Memory{T}"/> of <see cref="byte"/> instance.
-        /// </summary>
-        /// <param name="memory">The input <see cref="Memory{T}"/> of <see cref="byte"/> instance.</param>
-        /// <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 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>
-        /// <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)
-        {
-            return MemoryStream.Create(memory, false);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/NullableExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/NullableExtensions.cs
deleted file mode 100644
index 43ea426f946..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/NullableExtensions.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.
-
-// This extension is restricted to the .NET 5 because it shares the same BCL
-// across all targets, ensuring that the layout of our Nullable<T> mapping type
-// will be correct. Exposing this API on older targets (especially .NET Standard)
-// is not guaranteed to be correct and could result in invalid memory accesses.
-#if NET5_0
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.HighPerformance.Extensions
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="Nullable{T}"/> type.
-    /// </summary>
-    public static class NullableExtensions
-    {
-        /// <summary>
-        /// Returns a reference to the value of the input <see cref="Nullable{T}"/> instance, regardless of whether
-        /// the <see cref="Nullable{T}.HasValue"/> property is returning <see langword="true"/> or not. If that is not
-        /// the case, this method will still return a reference to the underlying <see langword="default"/> value.
-        /// </summary>
-        /// <typeparam name="T">The type of the underlying value</typeparam>
-        /// <param name="value">The <see cref="Nullable{T}"/></param>
-        /// <returns>A reference to the underlying value from the input <see cref="Nullable{T}"/> instance.</returns>
-        /// <remarks>
-        /// Note that attempting to mutate the returned reference will not change the value returned by <see cref="Nullable{T}.HasValue"/>.
-        /// That means that reassigning the value of an empty instance will not make <see cref="Nullable{T}.HasValue"/> return <see langword="true"/>.
-        /// </remarks>
-        public static ref T DangerousGetValueOrDefaultReference<T>(this ref T? value)
-            where T : struct
-        {
-            return ref Unsafe.As<T?, RawNullableData<T>>(ref value).Value;
-        }
-
-        /// <summary>
-        /// Mapping type that reflects the internal layout of the <see cref="Nullable{T}"/> type.
-        /// See https://github.com/dotnet/runtime/blob/master/src/libraries/System.Private.CoreLib/src/System/Nullable.cs.
-        /// </summary>
-        /// <typeparam name="T">The value type wrapped by the current instance.</typeparam>
-        private struct RawNullableData<T>
-            where T : struct
-        {
-#pragma warning disable CS0649 // Unassigned fields
-            public bool HasValue;
-            public T Value;
-#pragma warning restore CS0649
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
deleted file mode 100644
index bbec0ff8e9b..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs
+++ /dev/null
@@ -1,158 +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.Buffers;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Buffers.Internals;
-using Microsoft.Toolkit.HighPerformance.Buffers.Internals.Interfaces;
-using MemoryStream = Microsoft.Toolkit.HighPerformance.Streams.MemoryStream;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="ReadOnlyMemory{T}"/> type.
-    /// </summary>
-    public static class ReadOnlyMemoryExtensions
-    {
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Returns a <see cref="ReadOnlyMemory2D{T}"/> instance wrapping the underlying data for the given <see cref="ReadOnlyMemory{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <returns>The resulting <see cref="ReadOnlyMemory2D{T}"/> instance.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="memory"/>.
-        /// </exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ReadOnlyMemory2D<T> AsMemory2D<T>(this ReadOnlyMemory<T> memory, int height, int width)
-        {
-            return new(memory, height, width);
-        }
-
-        /// <summary>
-        /// Returns a <see cref="ReadOnlyMemory2D{T}"/> instance wrapping the underlying data for the given <see cref="ReadOnlyMemory{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="ReadOnlyMemory{T}"/> instance.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> instance.</param>
-        /// <param name="offset">The initial offset within <paramref name="memory"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <returns>The resulting <see cref="ReadOnlyMemory2D{T}"/> instance.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="memory"/>.
-        /// </exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ReadOnlyMemory2D<T> AsMemory2D<T>(this ReadOnlyMemory<T> memory, int offset, int height, int width, int pitch)
-        {
-            return new(memory, offset, height, width, pitch);
-        }
-#endif
-
-        /// <summary>
-        /// Casts a <see cref="ReadOnlyMemory{T}"/> of one primitive type <typeparamref name="T"/> to <see cref="ReadOnlyMemory{T}"/> of bytes.
-        /// </summary>
-        /// <typeparam name="T">The type if items in the source <see cref="ReadOnlyMemory{T}"/>.</typeparam>
-        /// <param name="memory">The source <see cref="ReadOnlyMemory{T}"/>, of type <typeparamref name="T"/>.</param>
-        /// <returns>A <see cref="ReadOnlyMemory{T}"/> of bytes.</returns>
-        /// <exception cref="OverflowException">
-        /// Thrown if the <see cref="ReadOnlyMemory{T}.Length"/> property of the new <see cref="ReadOnlyMemory{T}"/> would exceed <see cref="int.MaxValue"/>.
-        /// </exception>
-        /// <exception cref="ArgumentException">Thrown when the data store of <paramref name="memory"/> is not supported.</exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ReadOnlyMemory<byte> AsBytes<T>(this ReadOnlyMemory<T> memory)
-            where T : unmanaged
-        {
-            return Cast<T, byte>(memory);
-        }
-
-        /// <summary>
-        /// Casts a <see cref="ReadOnlyMemory{T}"/> of one primitive type <typeparamref name="TFrom"/> to another primitive type <typeparamref name="TTo"/>.
-        /// </summary>
-        /// <typeparam name="TFrom">The type of items in the source <see cref="ReadOnlyMemory{T}"/>.</typeparam>
-        /// <typeparam name="TTo">The type of items in the destination <see cref="ReadOnlyMemory{T}"/>.</typeparam>
-        /// <param name="memory">The source <see cref="ReadOnlyMemory{T}"/>, of type <typeparamref name="TFrom"/>.</param>
-        /// <returns>A <see cref="ReadOnlyMemory{T}"/> of type <typeparamref name="TTo"/></returns>
-        /// <exception cref="ArgumentException">Thrown when the data store of <paramref name="memory"/> is not supported.</exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ReadOnlyMemory<TTo> Cast<TFrom, TTo>(this ReadOnlyMemory<TFrom> memory)
-            where TFrom : unmanaged
-            where TTo : unmanaged
-        {
-            if (memory.IsEmpty)
-            {
-                return default;
-            }
-
-            if (typeof(TFrom) == typeof(char) &&
-                MemoryMarshal.TryGetString((ReadOnlyMemory<char>)(object)memory, out string? text, out int start, out int length))
-            {
-                return new StringMemoryManager<TTo>(text!, start, length).Memory;
-            }
-
-            if (MemoryMarshal.TryGetArray(memory, out ArraySegment<TFrom> segment))
-            {
-                return new ArrayMemoryManager<TFrom, TTo>(segment.Array!, segment.Offset, segment.Count).Memory;
-            }
-
-            if (MemoryMarshal.TryGetMemoryManager<TFrom, MemoryManager<TFrom>>(memory, out var memoryManager, out start, out length))
-            {
-                // If the memory manager is the one resulting from a previous cast, we can use it directly to retrieve
-                // a new manager for the target type that wraps the original data store, instead of creating one that
-                // wraps the current manager. This ensures that doing repeated casts always results in only up to one
-                // indirection level in the chain of memory managers needed to access the target data buffer to use.
-                if (memoryManager is IMemoryManager wrappingManager)
-                {
-                    return wrappingManager.GetMemory<TTo>(start, length);
-                }
-
-                return new ProxyMemoryManager<TFrom, TTo>(memoryManager, start, length).Memory;
-            }
-
-            // Throws when the memory instance has an unsupported backing store
-            static ReadOnlyMemory<TTo> ThrowArgumentExceptionForUnsupportedMemory()
-            {
-                throw new ArgumentException("The input instance doesn't have a supported underlying data store.");
-            }
-
-            return ThrowArgumentExceptionForUnsupportedMemory();
-        }
-
-        /// <summary>
-        /// Returns a <see cref="Stream"/> wrapping the contents of the given <see cref="ReadOnlyMemory{T}"/> of <see cref="byte"/> instance.
-        /// </summary>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> of <see cref="byte"/> instance.</param>
-        /// <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 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>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="memory"/> has an invalid data store.</exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Stream AsStream(this ReadOnlyMemory<byte> memory)
-        {
-            return MemoryStream.Create(memory, true);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
deleted file mode 100644
index 6dd5263dccd..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs
+++ /dev/null
@@ -1,403 +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;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Enumerables;
-using Microsoft.Toolkit.HighPerformance.Helpers.Internals;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="ReadOnlySpan{T}"/> type.
-    /// </summary>
-    public static class ReadOnlySpanExtensions
-    {
-        /// <summary>
-        /// Returns a reference to the first element within a given <see cref="ReadOnlySpan{T}"/>, with no bounds checks.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance.</param>
-        /// <returns>A reference to the first element within <paramref name="span"/>.</returns>
-        /// <remarks>This method doesn't do any bounds checks, therefore it is responsibility of the caller to perform checks in case the returned value is dereferenced.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T DangerousGetReference<T>(this ReadOnlySpan<T> span)
-        {
-            return ref MemoryMarshal.GetReference(span);
-        }
-
-        /// <summary>
-        /// Returns a reference to an element at a specified index within a given <see cref="ReadOnlySpan{T}"/>, with no bounds checks.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance.</param>
-        /// <param name="i">The index of the element to retrieve within <paramref name="span"/>.</param>
-        /// <returns>A reference to the element within <paramref name="span"/> at the index specified by <paramref name="i"/>.</returns>
-        /// <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)
-        {
-            // Here we assume the input index will never be negative, so we do a (nint)(uint) 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 (nint)(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 nint, so that we can obtain an IntPtr value without the range check (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, (nint)(uint)i);
-
-            return ref ri;
-        }
-
-        /// <summary>
-        /// Returns a reference to an element at a specified index within a given <see cref="ReadOnlySpan{T}"/>, with no bounds checks.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance.</param>
-        /// <param name="i">The index of the element to retrieve within <paramref name="span"/>.</param>
-        /// <returns>A reference to the element within <paramref name="span"/> at the index specified by <paramref name="i"/>.</returns>
-        /// <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, nint i)
-        {
-            ref T r0 = ref MemoryMarshal.GetReference(span);
-            ref T ri = ref Unsafe.Add(ref r0, i);
-
-            return ref ri;
-        }
-
-        /// <summary>
-        /// Returns a reference to the first element within a given <see cref="ReadOnlySpan{T}"/>, clamping the input index in the valid range.
-        /// If the <paramref name="i"/> parameter exceeds the length of <paramref name="span"/>, it will be clamped to 0.
-        /// Therefore, the returned reference will always point to a valid element within <paramref name="span"/>, assuming it is not empty.
-        /// This method is specifically meant to efficiently index lookup tables, especially if they point to constant data.
-        /// Consider this example where a lookup table is used to validate whether a given character is within a specific set:
-        /// <code>
-        /// public static ReadOnlySpan&lt;bool> ValidSetLookupTable => new bool[]
-        /// {
-        ///     false, true, true, true, true, true, false, true,
-        ///     false, false, true, false, true, false, true, false,
-        ///     true, false, false, true, false, false, false, false,
-        ///     false, false, false, false, true, true, false, true
-        /// };
-        ///
-        /// int ch = Console.Read();
-        /// bool isValid = ValidSetLookupTable.DangerousGetLookupReference(ch);
-        /// </code>
-        /// Even if the input index is outside the range of the lookup table, being clamped to 0, it will
-        /// just cause the value 0 to be returned in this case, which is functionally the same for the check
-        /// being performed. This extension can easily be used whenever the first position in a lookup
-        /// table being referenced corresponds to a falsey value, like in this case.
-        /// Additionally, the example above leverages a compiler optimization introduced with C# 7.3,
-        /// which allows <see cref="ReadOnlySpan{T}"/> instances pointing to compile-time constant data
-        /// to be directly mapped to the static .text section in the final assembly: the array being
-        /// created in code will never actually be allocated, and the <see cref="ReadOnlySpan{T}"/> will
-        /// just point to constant data. Note that this only works for blittable values that are not
-        /// dependent on the byte endianness of the system, like <see cref="byte"/> or <see cref="bool"/>.
-        /// For more info, see <see href="https://vcsjones.dev/2019/02/01/csharp-readonly-span-bytes-static/"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance.</param>
-        /// <param name="i">The index of the element to retrieve within <paramref name="span"/>.</param>
-        /// <returns>
-        /// A reference to the element within <paramref name="span"/> at the index specified by <paramref name="i"/>,
-        /// or a reference to the first element within <paramref name="span"/> if <paramref name="i"/> was not a valid index.
-        /// </returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        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
-            // the test to also identify cases where the input index is
-            // less than zero. The resulting bool is then reinterpreted
-            // as a byte (either 1 or 0), and then decremented.
-            // This will result in either 0 if the input index was
-            // valid for the target span, or -1 (0xFFFFFFFF) otherwise.
-            // 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 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
-            // lookup table can just be assumed to always be false.
-            bool isInRange = (uint)i < (uint)span.Length;
-            byte rangeFlag = *(byte*)&isInRange;
-            uint
-                negativeFlag = unchecked(rangeFlag - 1u),
-                mask = ~negativeFlag,
-                offset = (uint)i & mask;
-            ref T r0 = ref MemoryMarshal.GetReference(span);
-            ref T r1 = ref Unsafe.Add(ref r0, (nint)offset);
-
-            return ref r1;
-        }
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Returns a <see cref="ReadOnlySpan2D{T}"/> instance wrapping the underlying data for the given <see cref="ReadOnlySpan{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <returns>The resulting <see cref="ReadOnlySpan2D{T}"/> instance.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="span"/>.
-        /// </exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ReadOnlySpan2D<T> AsSpan2D<T>(this ReadOnlySpan<T> span, int height, int width)
-        {
-            return new(span, height, width);
-        }
-
-        /// <summary>
-        /// Returns a <see cref="ReadOnlySpan2D{T}"/> instance wrapping the underlying data for the given <see cref="ReadOnlySpan{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance.</param>
-        /// <param name="offset">The initial offset within <paramref name="span"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <returns>The resulting <see cref="ReadOnlySpan2D{T}"/> instance.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="span"/>.
-        /// </exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ReadOnlySpan2D<T> AsSpan2D<T>(this ReadOnlySpan<T> span, int offset, int height, int width, int pitch)
-        {
-            return new(span, offset, height, width, pitch);
-        }
-#endif
-
-        /// <summary>
-        /// Gets the index of an element of a given <see cref="ReadOnlySpan{T}"/> from its reference.
-        /// </summary>
-        /// <typeparam name="T">The type if items in the input <see cref="ReadOnlySpan{T}"/>.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> to calculate the index for.</param>
-        /// <param name="value">The reference to the target item to get the index for.</param>
-        /// <returns>The index of <paramref name="value"/> within <paramref name="span"/>.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> does not belong to <paramref name="span"/>.</exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int IndexOf<T>(this ReadOnlySpan<T> span, in T value)
-        {
-            ref T r0 = ref MemoryMarshal.GetReference(span);
-            ref T r1 = ref Unsafe.AsRef(value);
-            IntPtr byteOffset = Unsafe.ByteOffset(ref r0, ref r1);
-
-            nint elementOffset = byteOffset / (nint)(uint)Unsafe.SizeOf<T>();
-
-            if ((nuint)elementOffset >= (uint)span.Length)
-            {
-                SpanExtensions.ThrowArgumentOutOfRangeExceptionForInvalidReference();
-            }
-
-            return (int)elementOffset;
-        }
-
-        /// <summary>
-        /// Counts the number of occurrences of a given value into a target <see cref="ReadOnlySpan{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance to read.</param>
-        /// <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.AggressiveInlining)]
-        public static int Count<T>(this ReadOnlySpan<T> span, T value)
-            where T : IEquatable<T>
-        {
-            ref T r0 = ref MemoryMarshal.GetReference(span);
-            nint length = (nint)(uint)span.Length;
-
-            return (int)SpanHelper.Count(ref r0, length, value);
-        }
-
-        /// <summary>
-        /// Casts a <see cref="ReadOnlySpan{T}"/> of one primitive type <typeparamref name="T"/> to <see cref="ReadOnlySpan{T}"/> of bytes.
-        /// </summary>
-        /// <typeparam name="T">The type if items in the source <see cref="ReadOnlySpan{T}"/>.</typeparam>
-        /// <param name="span">The source slice, of type <typeparamref name="T"/>.</param>
-        /// <returns>A <see cref="ReadOnlySpan{T}"/> of bytes.</returns>
-        /// <exception cref="OverflowException">
-        /// Thrown if the <see cref="ReadOnlySpan{T}.Length"/> property of the new <see cref="ReadOnlySpan{T}"/> would exceed <see cref="int.MaxValue"/>.
-        /// </exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ReadOnlySpan<byte> AsBytes<T>(this ReadOnlySpan<T> span)
-            where T : unmanaged
-        {
-            return MemoryMarshal.AsBytes(span);
-        }
-
-        /// <summary>
-        /// Casts a <see cref="ReadOnlySpan{T}"/> of one primitive type <typeparamref name="TFrom"/> to another primitive type <typeparamref name="TTo"/>.
-        /// </summary>
-        /// <typeparam name="TFrom">The type of items in the source <see cref="ReadOnlySpan{T}"/>.</typeparam>
-        /// <typeparam name="TTo">The type of items in the destination <see cref="ReadOnlySpan{T}"/>.</typeparam>
-        /// <param name="span">The source slice, of type <typeparamref name="TFrom"/>.</param>
-        /// <returns>A <see cref="ReadOnlySpan{T}"/> of type <typeparamref name="TTo"/></returns>
-        /// <remarks>
-        /// Supported only for platforms that support misaligned memory access or when the memory block is aligned by other means.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ReadOnlySpan<TTo> Cast<TFrom, TTo>(this ReadOnlySpan<TFrom> span)
-            where TFrom : unmanaged
-            where TTo : unmanaged
-        {
-            return MemoryMarshal.Cast<TFrom, TTo>(span);
-        }
-
-        /// <summary>
-        /// Enumerates the items in the input <see cref="ReadOnlySpan{T}"/> instance, as pairs of value/index values.
-        /// This extension should be used directly within a <see langword="foreach"/> loop:
-        /// <code>
-        /// ReadOnlySpan&lt;string&gt; words = new[] { "Hello", ", ", "world", "!" };
-        ///
-        /// foreach (var item in words.Enumerate())
-        /// {
-        ///     // Access the index and value of each item here...
-        ///     int index = item.Index;
-        ///     string 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.
-        /// </summary>
-        /// <typeparam name="T">The type of items to enumerate.</typeparam>
-        /// <param name="span">The source <see cref="ReadOnlySpan{T}"/> to enumerate.</param>
-        /// <returns>A wrapper type that will handle the value/index enumeration for <paramref name="span"/>.</returns>
-        /// <remarks>The returned <see cref="ReadOnlySpanEnumerable{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ReadOnlySpanEnumerable<T> Enumerate<T>(this ReadOnlySpan<T> span)
-        {
-            return new(span);
-        }
-
-        /// <summary>
-        /// Tokenizes the values in the input <see cref="ReadOnlySpan{T}"/> instance using a specified separator.
-        /// This extension should be used directly within a <see langword="foreach"/> loop:
-        /// <code>
-        /// ReadOnlySpan&lt;char&gt; text = "Hello, world!";
-        ///
-        /// foreach (var token in text.Tokenize(','))
-        /// {
-        ///     // Access the tokens here...
-        /// }
-        /// </code>
-        /// The compiler will take care of properly setting up the <see langword="foreach"/> loop with the type returned from this method.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the <see cref="ReadOnlySpan{T}"/> to tokenize.</typeparam>
-        /// <param name="span">The source <see cref="ReadOnlySpan{T}"/> to tokenize.</param>
-        /// <param name="separator">The separator <typeparamref name="T"/> item to use.</param>
-        /// <returns>A wrapper type that will handle the tokenization for <paramref name="span"/>.</returns>
-        /// <remarks>The returned <see cref="ReadOnlySpanTokenizer{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ReadOnlySpanTokenizer<T> Tokenize<T>(this ReadOnlySpan<T> span, T separator)
-            where T : IEquatable<T>
-        {
-            return new(span, separator);
-        }
-
-        /// <summary>
-        /// Gets a content hash from the input <see cref="ReadOnlySpan{T}"/> instance using the Djb2 algorithm.
-        /// It was designed by <see href="https://en.wikipedia.org/wiki/Daniel_J._Bernstein">Daniel J. Bernstein</see> and is a
-        /// <see href="https://en.wikipedia.org/wiki/List_of_hash_functions#Non-cryptographic_hash_functions">non-cryptographic has function</see>.
-        /// The main advantages of this algorithm are a good distribution of the resulting hash codes, which results in a relatively low
-        /// number of collisions, while at the same time being particularly fast to process, making it suitable for quickly hashing
-        /// 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 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
-        /// the provided <see cref="ReadOnlySpan{T}"/> instance, and then those values will be combined using the Djb2 algorithm.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance.</param>
-        /// <returns>The Djb2 value for the input <see cref="ReadOnlySpan{T}"/> instance.</returns>
-        /// <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)
-            where T : notnull
-        {
-            ref T r0 = ref MemoryMarshal.GetReference(span);
-            nint length = (nint)(uint)span.Length;
-
-            return SpanHelper.GetDjb2HashCode(ref r0, length);
-        }
-
-        /// <summary>
-        /// Copies the contents of a given <see cref="ReadOnlySpan{T}"/> into destination <see cref="RefEnumerable{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance.</param>
-        /// <param name="destination">The <see cref="RefEnumerable{T}"/> instance to copy items into.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the destination <see cref="RefEnumerable{T}"/> is shorter than the source <see cref="ReadOnlySpan{T}"/>.
-        /// </exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void CopyTo<T>(this ReadOnlySpan<T> span, RefEnumerable<T> destination)
-        {
-            destination.CopyFrom(span);
-        }
-
-        /// <summary>
-        /// Attempts to copy the contents of a given <see cref="ReadOnlySpan{T}"/> into destination <see cref="RefEnumerable{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="ReadOnlySpan{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance.</param>
-        /// <param name="destination">The <see cref="RefEnumerable{T}"/> instance to copy items into.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool TryCopyTo<T>(this ReadOnlySpan<T> span, RefEnumerable<T> destination)
-        {
-            return destination.TryCopyFrom(span);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs
deleted file mode 100644
index 1bb8cd35fba..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs
+++ /dev/null
@@ -1,301 +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;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Enumerables;
-using Microsoft.Toolkit.HighPerformance.Helpers.Internals;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="Span{T}"/> type.
-    /// </summary>
-    public static class SpanExtensions
-    {
-        /// <summary>
-        /// Returns a reference to the first element within a given <see cref="Span{T}"/>, with no bounds checks.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance.</param>
-        /// <returns>A reference to the first element within <paramref name="span"/>.</returns>
-        /// <remarks>This method doesn't do any bounds checks, therefore it is responsibility of the caller to perform checks in case the returned value is dereferenced.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T DangerousGetReference<T>(this Span<T> span)
-        {
-            return ref MemoryMarshal.GetReference(span);
-        }
-
-        /// <summary>
-        /// Returns a reference to an element at a specified index within a given <see cref="Span{T}"/>, with no bounds checks.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance.</param>
-        /// <param name="i">The index of the element to retrieve within <paramref name="span"/>.</param>
-        /// <returns>A reference to the element within <paramref name="span"/> at the index specified by <paramref name="i"/>.</returns>
-        /// <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)
-        {
-            ref T r0 = ref MemoryMarshal.GetReference(span);
-            ref T ri = ref Unsafe.Add(ref r0, (nint)(uint)i);
-
-            return ref ri;
-        }
-
-        /// <summary>
-        /// Returns a reference to an element at a specified index within a given <see cref="Span{T}"/>, with no bounds checks.
-        /// </summary>
-        /// <typeparam name="T">The type of elements in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance.</param>
-        /// <param name="i">The index of the element to retrieve within <paramref name="span"/>.</param>
-        /// <returns>A reference to the element within <paramref name="span"/> at the index specified by <paramref name="i"/>.</returns>
-        /// <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, nint i)
-        {
-            ref T r0 = ref MemoryMarshal.GetReference(span);
-            ref T ri = ref Unsafe.Add(ref r0, i);
-
-            return ref ri;
-        }
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Returns a <see cref="Span2D{T}"/> instance wrapping the underlying data for the given <see cref="Span{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <returns>The resulting <see cref="Span2D{T}"/> instance.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="span"/>.
-        /// </exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span2D<T> AsSpan2D<T>(this Span<T> span, int height, int width)
-        {
-            return new(span, height, width);
-        }
-
-        /// <summary>
-        /// Returns a <see cref="Span2D{T}"/> instance wrapping the underlying data for the given <see cref="Span{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance.</param>
-        /// <param name="offset">The initial offset within <paramref name="span"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <returns>The resulting <see cref="Span2D{T}"/> instance.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="span"/>.
-        /// </exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span2D<T> AsSpan2D<T>(this Span<T> span, int offset, int height, int width, int pitch)
-        {
-            return new(span, offset, height, width, pitch);
-        }
-#endif
-
-        /// <summary>
-        /// Casts a <see cref="Span{T}"/> of one primitive type <typeparamref name="T"/> to <see cref="Span{T}"/> of bytes.
-        /// </summary>
-        /// <typeparam name="T">The type if items in the source <see cref="Span{T}"/>.</typeparam>
-        /// <param name="span">The source slice, of type <typeparamref name="T"/>.</param>
-        /// <returns>A <see cref="Span{T}"/> of bytes.</returns>
-        /// <exception cref="OverflowException">
-        /// Thrown if the <see cref="Span{T}.Length"/> property of the new <see cref="Span{T}"/> would exceed <see cref="int.MaxValue"/>.
-        /// </exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span<byte> AsBytes<T>(this Span<T> span)
-            where T : unmanaged
-        {
-            return MemoryMarshal.AsBytes(span);
-        }
-
-        /// <summary>
-        /// Casts a <see cref="Span{T}"/> of one primitive type <typeparamref name="TFrom"/> to another primitive type <typeparamref name="TTo"/>.
-        /// </summary>
-        /// <typeparam name="TFrom">The type of items in the source <see cref="Span{T}"/>.</typeparam>
-        /// <typeparam name="TTo">The type of items in the destination <see cref="Span{T}"/>.</typeparam>
-        /// <param name="span">The source slice, of type <typeparamref name="TFrom"/>.</param>
-        /// <returns>A <see cref="Span{T}"/> of type <typeparamref name="TTo"/></returns>
-        /// <remarks>
-        /// Supported only for platforms that support misaligned memory access or when the memory block is aligned by other means.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Span<TTo> Cast<TFrom, TTo>(this Span<TFrom> span)
-            where TFrom : unmanaged
-            where TTo : unmanaged
-        {
-            return MemoryMarshal.Cast<TFrom, TTo>(span);
-        }
-
-        /// <summary>
-        /// Gets the index of an element of a given <see cref="Span{T}"/> from its reference.
-        /// </summary>
-        /// <typeparam name="T">The type if items in the input <see cref="Span{T}"/>.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> to calculate the index for.</param>
-        /// <param name="value">The reference to the target item to get the index for.</param>
-        /// <returns>The index of <paramref name="value"/> within <paramref name="span"/>.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if <paramref name="value"/> does not belong to <paramref name="span"/>.</exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int IndexOf<T>(this Span<T> span, ref T value)
-        {
-            ref T r0 = ref MemoryMarshal.GetReference(span);
-            IntPtr byteOffset = Unsafe.ByteOffset(ref r0, ref value);
-
-            nint elementOffset = byteOffset / (nint)(uint)Unsafe.SizeOf<T>();
-
-            if ((nuint)elementOffset >= (uint)span.Length)
-            {
-                ThrowArgumentOutOfRangeExceptionForInvalidReference();
-            }
-
-            return (int)elementOffset;
-        }
-
-        /// <summary>
-        /// Counts the number of occurrences of a given value into a target <see cref="Span{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance to read.</param>
-        /// <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.AggressiveInlining)]
-        public static int Count<T>(this Span<T> span, T value)
-            where T : IEquatable<T>
-        {
-            ref T r0 = ref MemoryMarshal.GetReference(span);
-            nint length = (nint)(uint)span.Length;
-
-            return (int)SpanHelper.Count(ref r0, length, value);
-        }
-
-        /// <summary>
-        /// Enumerates the items in the input <see cref="Span{T}"/> instance, as pairs of reference/index values.
-        /// This extension should be used directly within a <see langword="foreach"/> loop:
-        /// <code>
-        /// Span&lt;int&gt; numbers = new[] { 1, 2, 3, 4, 5, 6, 7 };
-        ///
-        /// foreach (var item in numbers.Enumerate())
-        /// {
-        ///     // Access the index and value of each item here...
-        ///     int index = item.Index;
-        ///     ref int value = ref item.Value;
-        /// }
-        /// </code>
-        /// The compiler will take care of properly setting up the <see langword="foreach"/> loop with the type returned from this method.
-        /// </summary>
-        /// <typeparam name="T">The type of items to enumerate.</typeparam>
-        /// <param name="span">The source <see cref="Span{T}"/> to enumerate.</param>
-        /// <returns>A wrapper type that will handle the reference/index enumeration for <paramref name="span"/>.</returns>
-        /// <remarks>The returned <see cref="SpanEnumerable{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static SpanEnumerable<T> Enumerate<T>(this Span<T> span)
-        {
-            return new(span);
-        }
-
-        /// <summary>
-        /// Tokenizes the values in the input <see cref="Span{T}"/> instance using a specified separator.
-        /// This extension should be used directly within a <see langword="foreach"/> loop:
-        /// <code>
-        /// Span&lt;char&gt; text = "Hello, world!".ToCharArray();
-        ///
-        /// foreach (var token in text.Tokenize(','))
-        /// {
-        ///     // Access the tokens here...
-        /// }
-        /// </code>
-        /// The compiler will take care of properly setting up the <see langword="foreach"/> loop with the type returned from this method.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the <see cref="Span{T}"/> to tokenize.</typeparam>
-        /// <param name="span">The source <see cref="Span{T}"/> to tokenize.</param>
-        /// <param name="separator">The separator <typeparamref name="T"/> item to use.</param>
-        /// <returns>A wrapper type that will handle the tokenization for <paramref name="span"/>.</returns>
-        /// <remarks>The returned <see cref="SpanTokenizer{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static SpanTokenizer<T> Tokenize<T>(this Span<T> span, T separator)
-            where T : IEquatable<T>
-        {
-            return new(span, separator);
-        }
-
-        /// <summary>
-        /// Gets a content hash from the input <see cref="Span{T}"/> instance using the Djb2 algorithm.
-        /// For more info, see the documentation for <see cref="ReadOnlySpanExtensions.GetDjb2HashCode{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance.</param>
-        /// <returns>The Djb2 value for the input <see cref="Span{T}"/> instance.</returns>
-        /// <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)
-            where T : notnull
-        {
-            ref T r0 = ref MemoryMarshal.GetReference(span);
-            nint length = (nint)(uint)span.Length;
-
-            return SpanHelper.GetDjb2HashCode(ref r0, length);
-        }
-
-        /// <summary>
-        /// Copies the contents of a given <see cref="Span{T}"/> into destination <see cref="RefEnumerable{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance.</param>
-        /// <param name="destination">The <see cref="RefEnumerable{T}"/> instance to copy items into.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the destination <see cref="RefEnumerable{T}"/> is shorter than the source <see cref="Span{T}"/>.
-        /// </exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void CopyTo<T>(this Span<T> span, RefEnumerable<T> destination)
-        {
-            destination.CopyFrom(span);
-        }
-
-        /// <summary>
-        /// Attempts to copy the contents of a given <see cref="Span{T}"/> into destination <see cref="RefEnumerable{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items in the input <see cref="Span{T}"/> instance.</typeparam>
-        /// <param name="span">The input <see cref="Span{T}"/> instance.</param>
-        /// <param name="destination">The <see cref="RefEnumerable{T}"/> instance to copy items into.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool TryCopyTo<T>(this Span<T> span, RefEnumerable<T> destination)
-        {
-            return destination.TryCopyFrom(span);
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the given reference is out of range.
-        /// </summary>
-        internal static void ThrowArgumentOutOfRangeExceptionForInvalidReference()
-        {
-            throw new ArgumentOutOfRangeException("value", "The input reference does not belong to an element of the input span");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/SpinLockExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/SpinLockExtensions.cs
deleted file mode 100644
index 506fab69f24..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/SpinLockExtensions.cs
+++ /dev/null
@@ -1,188 +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.ComponentModel;
-using System.Runtime.CompilerServices;
-using System.Threading;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="SpinLock"/> type.
-    /// </summary>
-    public static class SpinLockExtensions
-    {
-        /// <summary>
-        /// Enters a specified <see cref="SpinLock"/> instance and returns a wrapper to use to release the lock.
-        /// This extension should be used though a <see langword="using"/> block or statement:
-        /// <code>
-        /// SpinLock spinLock = new SpinLock();
-        ///
-        /// using (SpinLockExtensions.Enter(&amp;spinLock))
-        /// {
-        ///     // Thread-safe code here...
-        /// }
-        /// </code>
-        /// The compiler will take care of releasing the SpinLock when the code goes out of that <see langword="using"/> scope.
-        /// </summary>
-        /// <param name="spinLock">A pointer to the target <see cref="SpinLock"/> to use</param>
-        /// <returns>A wrapper type that will release <paramref name="spinLock"/> when its <see cref="System.IDisposable.Dispose"/> method is called.</returns>
-        /// <remarks>The returned <see cref="UnsafeLock"/> value shouldn't be used directly: use this extension in a <see langword="using"/> block or statement.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe UnsafeLock Enter(SpinLock* spinLock)
-        {
-            return new(spinLock);
-        }
-
-        /// <summary>
-        /// A <see langword="struct"/> that is used to enter and hold a <see cref="SpinLock"/> through a <see langword="using"/> block or statement.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public readonly unsafe ref struct UnsafeLock
-        {
-            /// <summary>
-            /// The <see cref="SpinLock"/>* pointer to the target <see cref="SpinLock"/> value to use.
-            /// </summary>
-            private readonly SpinLock* spinLock;
-
-            /// <summary>
-            /// A value indicating whether or not the lock is taken by this <see cref="Lock"/> instance.
-            /// </summary>
-            private readonly bool lockTaken;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="UnsafeLock"/> struct.
-            /// </summary>
-            /// <param name="spinLock">The target <see cref="SpinLock"/> to use.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public UnsafeLock(SpinLock* spinLock)
-            {
-                this.spinLock = spinLock;
-                this.lockTaken = false;
-
-                spinLock->Enter(ref this.lockTaken);
-            }
-
-            /// <summary>
-            /// Implements the duck-typed <see cref="System.IDisposable.Dispose"/> method and releases the current <see cref="SpinLock"/> instance.
-            /// </summary>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public void Dispose()
-            {
-                if (this.lockTaken)
-                {
-                    this.spinLock->Exit();
-                }
-            }
-        }
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Enters a specified <see cref="SpinLock"/> instance and returns a wrapper to use to release the lock.
-        /// This extension should be used though a <see langword="using"/> block or statement:
-        /// <code>
-        /// SpinLock spinLock = new SpinLock();
-        ///
-        /// using (spinLock.Enter())
-        /// {
-        ///     // Thread-safe code here...
-        /// }
-        /// </code>
-        /// The compiler will take care of releasing the SpinLock when the code goes out of that <see langword="using"/> scope.
-        /// </summary>
-        /// <param name="spinLock">The target <see cref="SpinLock"/> to use</param>
-        /// <returns>A wrapper type that will release <paramref name="spinLock"/> when its <see cref="System.IDisposable.Dispose"/> method is called.</returns>
-        /// <remarks>The returned <see cref="Lock"/> value shouldn't be used directly: use this extension in a <see langword="using"/> block or statement.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Lock Enter(ref this SpinLock spinLock)
-        {
-            return new(ref spinLock);
-        }
-#else
-        /// <summary>
-        /// Enters a specified <see cref="SpinLock"/> instance and returns a wrapper to use to release the lock.
-        /// This extension should be used though a <see langword="using"/> block or statement:
-        /// <code>
-        /// private SpinLock spinLock = new SpinLock();
-        ///
-        /// public void Foo()
-        /// {
-        ///     using (SpinLockExtensions.Enter(this, ref spinLock))
-        ///     {
-        ///         // Thread-safe code here...
-        ///     }
-        /// }
-        /// </code>
-        /// The compiler will take care of releasing the SpinLock when the code goes out of that <see langword="using"/> scope.
-        /// </summary>
-        /// <param name="owner">The owner <see cref="object"/> to create a portable reference for.</param>
-        /// <param name="spinLock">The target <see cref="SpinLock"/> to use (it must be within <paramref name="owner"/>).</param>
-        /// <returns>A wrapper type that will release <paramref name="spinLock"/> when its <see cref="System.IDisposable.Dispose"/> method is called.</returns>
-        /// <remarks>The returned <see cref="Lock"/> value shouldn't be used directly: use this extension in a <see langword="using"/> block or statement.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Lock Enter(object owner, ref SpinLock spinLock)
-        {
-            return new(owner, ref spinLock);
-        }
-#endif
-
-        /// <summary>
-        /// A <see langword="struct"/> that is used to enter and hold a <see cref="SpinLock"/> through a <see langword="using"/> block or statement.
-        /// </summary>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public readonly ref struct Lock
-        {
-            /// <summary>
-            /// The <see cref="Ref{T}"/> instance pointing to the target <see cref="SpinLock"/> value to use.
-            /// </summary>
-            private readonly Ref<SpinLock> spinLock;
-
-            /// <summary>
-            /// A value indicating whether or not the lock is taken by this <see cref="Lock"/> instance.
-            /// </summary>
-            private readonly bool lockTaken;
-
-#if SPAN_RUNTIME_SUPPORT
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Lock"/> struct.
-            /// </summary>
-            /// <param name="spinLock">The target <see cref="SpinLock"/> to use.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Lock(ref SpinLock spinLock)
-            {
-                this.spinLock = new Ref<SpinLock>(ref spinLock);
-                this.lockTaken = false;
-
-                spinLock.Enter(ref this.lockTaken);
-            }
-#else
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Lock"/> struct.
-            /// </summary>
-            /// <param name="owner">The owner <see cref="object"/> to create a portable reference for.</param>
-            /// <param name="spinLock">The target <see cref="SpinLock"/> to use (it must be within <paramref name="owner"/>).</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Lock(object owner, ref SpinLock spinLock)
-            {
-                this.spinLock = new Ref<SpinLock>(owner, ref spinLock);
-                this.lockTaken = false;
-
-                spinLock.Enter(ref this.lockTaken);
-            }
-#endif
-
-            /// <summary>
-            /// Implements the duck-typed <see cref="System.IDisposable.Dispose"/> method and releases the current <see cref="SpinLock"/> instance.
-            /// </summary>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public void Dispose()
-            {
-                if (this.lockTaken)
-                {
-                    this.spinLock.Value.Exit();
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/StreamExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/StreamExtensions.cs
deleted file mode 100644
index 22b91d083b7..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/StreamExtensions.cs
+++ /dev/null
@@ -1,253 +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.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-#if !SPAN_RUNTIME_SUPPORT
-using System.Buffers;
-using System.Threading;
-using System.Threading.Tasks;
-#endif
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="Stream"/> type.
-    /// </summary>
-    public static class StreamExtensions
-    {
-#if !SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Asynchronously reads a sequence of bytes from a given <see cref="Stream"/> instance.
-        /// </summary>
-        /// <param name="stream">The source <see cref="Stream"/> to read data from.</param>
-        /// <param name="buffer">The destination <see cref="Memory{T}"/> to write data to.</param>
-        /// <param name="cancellationToken">The optional <see cref="CancellationToken"/> for the operation.</param>
-        /// <returns>A <see cref="ValueTask"/> representing the operation being performed.</returns>
-        public static ValueTask<int> ReadAsync(this Stream stream, Memory<byte> buffer, CancellationToken cancellationToken = default)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return new ValueTask<int>(Task.FromCanceled<int>(cancellationToken));
-            }
-
-            // If the memory wraps an array, extract it and use it directly
-            if (MemoryMarshal.TryGetArray(buffer, out ArraySegment<byte> segment))
-            {
-                return new ValueTask<int>(stream.ReadAsync(segment.Array!, segment.Offset, segment.Count, cancellationToken));
-            }
-
-            // Local function used as the fallback path. This happens when the input memory
-            // doesn't wrap an array instance we can use. We use a local function as we need
-            // the body to be asynchronous, in order to execute the finally block after the
-            // write operation has been completed. By separating the logic, we can keep the
-            // main method as a synchronous, value-task returning function. This fallback
-            // path should hopefully be pretty rare, as memory instances are typically just
-            // created around arrays, often being rented from a memory pool in particular.
-            static async Task<int> ReadAsyncFallback(Stream stream, Memory<byte> buffer, CancellationToken cancellationToken)
-            {
-                byte[] rent = ArrayPool<byte>.Shared.Rent(buffer.Length);
-
-                try
-                {
-                    int bytesRead = await stream.ReadAsync(rent, 0, buffer.Length, cancellationToken);
-
-                    if (bytesRead > 0)
-                    {
-                        rent.AsSpan(0, bytesRead).CopyTo(buffer.Span);
-                    }
-
-                    return bytesRead;
-                }
-                finally
-                {
-                    ArrayPool<byte>.Shared.Return(rent);
-                }
-            }
-
-            return new ValueTask<int>(ReadAsyncFallback(stream, buffer, cancellationToken));
-        }
-
-        /// <summary>
-        /// Asynchronously writes a sequence of bytes to a given <see cref="Stream"/> instance.
-        /// </summary>
-        /// <param name="stream">The destination <see cref="Stream"/> to write data to.</param>
-        /// <param name="buffer">The source <see cref="ReadOnlyMemory{T}"/> to read data from.</param>
-        /// <param name="cancellationToken">The optional <see cref="CancellationToken"/> for the operation.</param>
-        /// <returns>A <see cref="ValueTask"/> representing the operation being performed.</returns>
-        public static ValueTask WriteAsync(this Stream stream, ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return new ValueTask(Task.FromCanceled(cancellationToken));
-            }
-
-            if (MemoryMarshal.TryGetArray(buffer, out ArraySegment<byte> segment))
-            {
-                return new ValueTask(stream.WriteAsync(segment.Array!, segment.Offset, segment.Count, cancellationToken));
-            }
-
-            // Local function, same idea as above
-            static async Task WriteAsyncFallback(Stream stream, ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken)
-            {
-                byte[] rent = ArrayPool<byte>.Shared.Rent(buffer.Length);
-
-                try
-                {
-                    buffer.Span.CopyTo(rent);
-
-                    await stream.WriteAsync(rent, 0, buffer.Length, cancellationToken);
-                }
-                finally
-                {
-                    ArrayPool<byte>.Shared.Return(rent);
-                }
-            }
-
-            return new ValueTask(WriteAsyncFallback(stream, buffer, cancellationToken));
-        }
-
-        /// <summary>
-        /// Reads a sequence of bytes from a given <see cref="Stream"/> instance.
-        /// </summary>
-        /// <param name="stream">The source <see cref="Stream"/> to read data from.</param>
-        /// <param name="buffer">The target <see cref="Span{T}"/> to write data to.</param>
-        /// <returns>The number of bytes that have been read.</returns>
-        public static int Read(this Stream stream, Span<byte> buffer)
-        {
-            byte[] rent = ArrayPool<byte>.Shared.Rent(buffer.Length);
-
-            try
-            {
-                int bytesRead = stream.Read(rent, 0, buffer.Length);
-
-                if (bytesRead > 0)
-                {
-                    rent.AsSpan(0, bytesRead).CopyTo(buffer);
-                }
-
-                return bytesRead;
-            }
-            finally
-            {
-                ArrayPool<byte>.Shared.Return(rent);
-            }
-        }
-
-        /// <summary>
-        /// Writes a sequence of bytes to a given <see cref="Stream"/> instance.
-        /// </summary>
-        /// <param name="stream">The destination <see cref="Stream"/> to write data to.</param>
-        /// <param name="buffer">The source <see cref="Span{T}"/> to read data from.</param>
-        public static void Write(this Stream stream, ReadOnlySpan<byte> buffer)
-        {
-            byte[] rent = ArrayPool<byte>.Shared.Rent(buffer.Length);
-
-            try
-            {
-                buffer.CopyTo(rent);
-
-                stream.Write(rent, 0, buffer.Length);
-            }
-            finally
-            {
-                ArrayPool<byte>.Shared.Return(rent);
-            }
-        }
-#endif
-
-        /// <summary>
-        /// Reads a value of a specified type from a source <see cref="Stream"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of value to read.</typeparam>
-        /// <param name="stream">The source <see cref="Stream"/> instance to read from.</param>
-        /// <returns>The <typeparamref name="T"/> value read from <paramref name="stream"/>.</returns>
-        /// <exception cref="InvalidOperationException">Thrown if <paramref name="stream"/> reaches the end.</exception>
-#if SPAN_RUNTIME_SUPPORT
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-#endif
-        public static T Read<T>(this Stream stream)
-            where T : unmanaged
-        {
-#if SPAN_RUNTIME_SUPPORT
-            T result = default;
-            int length = Unsafe.SizeOf<T>();
-
-            unsafe
-            {
-                if (stream.Read(new Span<byte>(&result, length)) != length)
-                {
-                    ThrowInvalidOperationExceptionForEndOfStream();
-                }
-            }
-
-            return result;
-#else
-            int length = Unsafe.SizeOf<T>();
-            byte[] buffer = ArrayPool<byte>.Shared.Rent(length);
-
-            try
-            {
-                if (stream.Read(buffer, 0, length) != length)
-                {
-                    ThrowInvalidOperationExceptionForEndOfStream();
-                }
-
-                return Unsafe.ReadUnaligned<T>(ref buffer[0]);
-            }
-            finally
-            {
-                ArrayPool<byte>.Shared.Return(buffer);
-            }
-#endif
-        }
-
-        /// <summary>
-        /// Writes a value of a specified type into a target <see cref="Stream"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of value to write.</typeparam>
-        /// <param name="stream">The target <see cref="Stream"/> instance to write to.</param>
-        /// <param name="value">The input value to write to <paramref name="stream"/>.</param>
-#if SPAN_RUNTIME_SUPPORT
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-#endif
-        public static void Write<T>(this Stream stream, in T value)
-            where T : unmanaged
-        {
-#if SPAN_RUNTIME_SUPPORT
-            ref T r0 = ref Unsafe.AsRef(value);
-            ref byte r1 = ref Unsafe.As<T, byte>(ref r0);
-            int length = Unsafe.SizeOf<T>();
-
-            ReadOnlySpan<byte> span = MemoryMarshal.CreateReadOnlySpan(ref r1, length);
-
-            stream.Write(span);
-#else
-            int length = Unsafe.SizeOf<T>();
-            byte[] buffer = ArrayPool<byte>.Shared.Rent(length);
-
-            try
-            {
-                Unsafe.WriteUnaligned(ref buffer[0], value);
-
-                stream.Write(buffer, 0, length);
-            }
-            finally
-            {
-                ArrayPool<byte>.Shared.Return(buffer);
-            }
-#endif
-        }
-
-        /// <summary>
-        /// Throws an <see cref="InvalidOperationException"/> when <see cref="Read{T}"/> fails.
-        /// </summary>
-        private static void ThrowInvalidOperationExceptionForEndOfStream()
-        {
-            throw new InvalidOperationException("The stream didn't contain enough data to read the requested item");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs
deleted file mode 100644
index c563bdd3e44..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.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;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-#if NETCOREAPP2_1 || NETSTANDARD
-using System.Runtime.InteropServices;
-#endif
-using Microsoft.Toolkit.HighPerformance.Enumerables;
-using Microsoft.Toolkit.HighPerformance.Helpers.Internals;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// Helpers for working with the <see cref="string"/> type.
-    /// </summary>
-    public static class StringExtensions
-    {
-        /// <summary>
-        /// Returns a reference to the first element within a given <see cref="string"/>, with no bounds checks.
-        /// </summary>
-        /// <param name="text">The input <see cref="string"/> instance.</param>
-        /// <returns>A reference to the first element within <paramref name="text"/>, or the location it would have used, if <paramref name="text"/> is empty.</returns>
-        /// <remarks>This method doesn't do any bounds checks, therefore it is responsibility of the caller to perform checks in case the returned value is dereferenced.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref char DangerousGetReference(this string text)
-        {
-#if NETCOREAPP3_1 || NET5_0
-            return ref Unsafe.AsRef(text.GetPinnableReference());
-#elif NETCOREAPP2_1
-            var stringData = Unsafe.As<RawStringData>(text)!;
-
-            return ref stringData.Data;
-#else
-            return ref MemoryMarshal.GetReference(text.AsSpan());
-#endif
-        }
-
-        /// <summary>
-        /// Returns a reference to an element at a specified index within a given <see cref="string"/>, with no bounds checks.
-        /// </summary>
-        /// <param name="text">The input <see cref="string"/> instance.</param>
-        /// <param name="i">The index of the element to retrieve within <paramref name="text"/>.</param>
-        /// <returns>A reference to the element within <paramref name="text"/> at the index specified by <paramref name="i"/>.</returns>
-        /// <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)
-        {
-#if NETCOREAPP3_1 || NET5_0
-            ref char r0 = ref Unsafe.AsRef(text.GetPinnableReference());
-#elif NETCOREAPP2_1
-            ref char r0 = ref Unsafe.As<RawStringData>(text)!.Data;
-#else
-            ref char r0 = ref MemoryMarshal.GetReference(text.AsSpan());
-#endif
-            ref char ri = ref Unsafe.Add(ref r0, (nint)(uint)i);
-
-            return ref ri;
-        }
-
-#if NETCOREAPP2_1
-        // Description adapted from CoreCLR: see https://source.dot.net/#System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.CoreCLR.cs,285.
-        // CLR strings are laid out in memory as follows:
-        // [ sync block || pMethodTable || length || string data .. ]
-        //                 ^                         ^
-        //                 |                         \-- ref Unsafe.As<RawStringData>(text).Data
-        //                 \-- string
-        // The reference to RawStringData.Data points to the first character in the
-        // string, skipping over the sync block, method table and string length.
-        [StructLayout(LayoutKind.Explicit)]
-        private sealed class RawStringData
-        {
-#pragma warning disable CS0649 // Unassigned fields
-#pragma warning disable SA1401 // Fields should be private
-            [FieldOffset(4)]
-            public char Data;
-#pragma warning restore CS0649
-#pragma warning restore SA1401
-        }
-#endif
-
-        /// <summary>
-        /// Counts the number of occurrences of a given character into a target <see cref="string"/> instance.
-        /// </summary>
-        /// <param name="text">The input <see cref="string"/> instance to read.</param>
-        /// <param name="c">The character to look for.</param>
-        /// <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)
-        {
-            ref char r0 = ref text.DangerousGetReference();
-            nint length = (nint)(uint)text.Length;
-
-            return (int)SpanHelper.Count(ref r0, length, c);
-        }
-
-        /// <summary>
-        /// Enumerates the items in the input <see cref="string"/> instance, as pairs of value/index values.
-        /// This extension should be used directly within a <see langword="foreach"/> loop:
-        /// <code>
-        /// string text = "Hello, world!";
-        ///
-        /// foreach (var item in text.Enumerate())
-        /// {
-        ///     // Access the index and value of each item here...
-        ///     int index = item.Index;
-        ///     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.
-        /// </summary>
-        /// <param name="text">The source <see cref="string"/> to enumerate.</param>
-        /// <returns>A wrapper type that will handle the value/index enumeration for <paramref name="text"/>.</returns>
-        /// <remarks>The returned <see cref="ReadOnlySpanEnumerable{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ReadOnlySpanEnumerable<char> Enumerate(this string text)
-        {
-            return new(text.AsSpan());
-        }
-
-        /// <summary>
-        /// Tokenizes the values in the input <see cref="string"/> instance using a specified separator.
-        /// This extension should be used directly within a <see langword="foreach"/> loop:
-        /// <code>
-        /// string text = "Hello, world!";
-        ///
-        /// foreach (var token in text.Tokenize(','))
-        /// {
-        ///     // Access the tokens here...
-        /// }
-        /// </code>
-        /// The compiler will take care of properly setting up the <see langword="foreach"/> loop with the type returned from this method.
-        /// </summary>
-        /// <param name="text">The source <see cref="string"/> to tokenize.</param>
-        /// <param name="separator">The separator character to use.</param>
-        /// <returns>A wrapper type that will handle the tokenization for <paramref name="text"/>.</returns>
-        /// <remarks>The returned <see cref="ReadOnlySpanTokenizer{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ReadOnlySpanTokenizer<char> Tokenize(this string text, char separator)
-        {
-            return new(text.AsSpan(), separator);
-        }
-
-        /// <summary>
-        /// Gets a content hash from the input <see cref="string"/> instance using the Djb2 algorithm.
-        /// For more info, see the documentation for <see cref="ReadOnlySpanExtensions.GetDjb2HashCode{T}"/>.
-        /// </summary>
-        /// <param name="text">The source <see cref="string"/> to enumerate.</param>
-        /// <returns>The Djb2 value for the input <see cref="string"/> instance.</returns>
-        /// <remarks>The Djb2 hash is fully deterministic and with no random components.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe int GetDjb2HashCode(this string text)
-        {
-            ref char r0 = ref text.DangerousGetReference();
-            nint length = (nint)(uint)text.Length;
-
-            return SpanHelper.GetDjb2HashCode(ref r0, length);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs b/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
deleted file mode 100644
index 76916c26b91..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/BitHelper.cs
+++ /dev/null
@@ -1,467 +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.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-#if NETCOREAPP3_1 || NET5_0
-using System.Runtime.Intrinsics.X86;
-#endif
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers
-{
-    /// <summary>
-    /// Helpers to perform bit operations on numeric types.
-    /// </summary>
-    public static class BitHelper
-    {
-        /// <summary>
-        /// Checks whether or not a given bit is set.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value.</param>
-        /// <param name="n">The position of the bit to check (in [0, 31] range).</param>
-        /// <returns>Whether or not the n-th bit is set.</returns>
-        /// <remarks>
-        /// This method doesn't validate <paramref name="n"/> against the valid range.
-        /// If the parameter is not valid, the result will just be inconsistent.
-        /// Additionally, no conditional branches are used to retrieve the flag.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe bool HasFlag(uint value, int n)
-        {
-            // Read the n-th bit, downcast to byte
-            byte flag = (byte)((value >> n) & 1);
-
-            // Reinterpret the byte to avoid the test, setnz and
-            // movzx instructions (asm x64). This is because the JIT
-            // compiler is able to optimize this reinterpret-cast as
-            // a single "and eax, 0x1" instruction, whereas if we had
-            // compared the previous computed flag against 0, the assembly
-            // would have had to perform the test, set the non-zero
-            // flag and then extend the (byte) result to eax.
-            return *(bool*)&flag;
-        }
-
-        /// <summary>
-        /// Checks whether or not a given bit is set in a given bitwise lookup table.
-        /// This method provides a branchless, register-based (with no memory accesses) way to
-        /// check whether a given value is valid, according to a precomputed lookup table.
-        /// It is similar in behavior to <see cref="HasFlag(uint,int)"/>, with the main difference
-        /// being that this method will also validate the input <paramref name="x"/> parameter, and
-        /// will always return <see langword="false"/> if it falls outside of the expected interval.
-        /// Additionally, this method accepts a <paramref name="min"/> parameter, which is used to
-        /// 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 link above would be implemented using this method:
-        /// <code>
-        /// bool IsReservedCharacter(char c)
-        /// {
-        ///     return BitHelper.HasLookupFlag(314575237u, c, 36);
-        /// }
-        /// </code>
-        /// The resulted assembly is virtually identical, with the added optimization that the one
-        /// produced by <see cref="HasLookupFlag(uint,int,int)"/> has no conditional branches at all.
-        /// </summary>
-        /// <param name="table">The input lookup table to use.</param>
-        /// <param name="x">The input value to check.</param>
-        /// <param name="min">The minimum accepted value for <paramref name="x"/> (defaults to 0).</param>
-        /// <returns>Whether or not the corresponding flag for <paramref name="x"/> is set in <paramref name="table"/>.</returns>
-        /// <remarks>
-        /// For best results, as shown in the sample code, both <paramref name="table"/> and <paramref name="min"/>
-        /// should be compile-time constants, so that the JIT compiler will be able to produce more efficient code.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe bool HasLookupFlag(uint table, int x, int min = 0)
-        {
-            // First, the input value is scaled down by the given minimum.
-            // This step will be skipped entirely if min is just the default of 0.
-            // The valid range is given by 32, which is the number of bits in the
-            // lookup table. The input value is first cast to uint so that if it was
-            // negative, the check will fail as well. Then, the result of this
-            // operation is used to compute a bitwise flag of either 0xFFFFFFFF if the
-            // input is accepted, or all 0 otherwise. The target bit is then extracted,
-            // and this value is combined with the previous mask. This is done so that
-            // if the shift was performed with a value that was too high, which has an
-            // undefined behavior and could produce a non-0 value, the mask will reset
-            // the final value anyway. This result is then unchecked-cast to a byte (as
-            // it is guaranteed to always be either 1 or 0), and then reinterpreted
-            // as a bool just like in the HasFlag method above, and then returned.
-            int i = x - min;
-            bool isInRange = (uint)i < 32u;
-            byte byteFlag = *(byte*)&isInRange;
-            int
-                negativeFlag = byteFlag - 1,
-                mask = ~negativeFlag,
-                shift = unchecked((int)((table >> i) & 1)),
-                and = shift & mask;
-            byte result = unchecked((byte)and);
-            bool valid = *(bool*)&result;
-
-            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 background on this subject, see <see href="https://graphics.stanford.edu/~seander/bithacks.html#ZeroInWord"/>.
-        /// </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>
-        /// 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#ZeroInWord"/>.
-        /// </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>
-        /// <param name="value">The target <see cref="uint"/> value.</param>
-        /// <param name="n">The position of the bit to set or clear (in [0, 31] range).</param>
-        /// <param name="flag">The value to assign to the target bit.</param>
-        /// <remarks>
-        /// Just like <see cref="HasFlag(uint,int)"/>, this method doesn't validate <paramref name="n"/>
-        /// and does not contain branching instructions, so it's well suited for use in tight loops as well.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void SetFlag(ref uint value, int n, bool flag)
-        {
-            value = SetFlag(value, n, flag);
-        }
-
-        /// <summary>
-        /// Sets a bit to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value.</param>
-        /// <param name="n">The position of the bit to set or clear (in [0, 31] range).</param>
-        /// <param name="flag">The value to assign to the target bit.</param>
-        /// <returns>An <see cref="uint"/> value equal to <paramref name="value"/> except for the <paramref name="n"/>-th bit.</returns>
-        /// <remarks>
-        /// Just like <see cref="HasFlag(uint,int)"/>, this method doesn't validate <paramref name="n"/>
-        /// and does not contain branching instructions, so it's well suited for use in tight loops as well.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe uint SetFlag(uint value, int n, bool flag)
-        {
-            // Shift a bit left to the n-th position, negate the
-            // resulting value and perform an AND with the input value.
-            // This effectively clears the n-th bit of our input.
-            uint
-                bit = 1u << n,
-                not = ~bit,
-                and = value & not;
-
-            // Reinterpret the flag as 1 or 0, and cast to uint,
-            // then we left shift the uint flag to the right position
-            // and perform an OR with the resulting value of the previous
-            // operation. This will always guaranteed to work, thanks to the
-            // initial code clearing that bit before setting it again.
-            bool copy = flag;
-            uint
-                flag32 = *(byte*)&copy,
-                shift = flag32 << n,
-                or = and | shift;
-
-            return or;
-        }
-
-        /// <summary>
-        /// Extracts a bit field range from a given value.
-        /// </summary>
-        /// <param name="value">The input <see cref="uint"/> value.</param>
-        /// <param name="start">The initial index of the range to extract (in [0, 31] range).</param>
-        /// <param name="length">The length of the range to extract (depends on <paramref name="start"/>).</param>
-        /// <returns>The value of the extracted range within <paramref name="value"/>.</returns>
-        /// <remarks>
-        /// This method doesn't validate <paramref name="start"/> and <paramref name="length"/>.
-        /// If either parameter is not valid, the result will just be inconsistent. The method
-        /// should not be used to set all the bits at once, and it is not guaranteed to work in
-        /// that case, which would just be equivalent to assigning the <see cref="uint"/> value.
-        /// Additionally, no conditional branches are used to retrieve the range.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static uint ExtractRange(uint value, byte start, byte length)
-        {
-#if NETCOREAPP3_1 || NET5_0
-            if (Bmi1.IsSupported)
-            {
-                return Bmi1.BitFieldExtract(value, start, length);
-            }
-#endif
-
-            return (value >> start) & ((1u << length) - 1u);
-        }
-
-        /// <summary>
-        /// Sets a bit field range within a target value.
-        /// </summary>
-        /// <param name="value">The target <see cref="uint"/> value.</param>
-        /// <param name="start">The initial index of the range to extract (in [0, 31] range).</param>
-        /// <param name="length">The length of the range to extract (depends on <paramref name="start"/>).</param>
-        /// <param name="flags">The input flags to insert in the target range.</param>
-        /// <remarks>
-        /// Just like <see cref="ExtractRange(uint,byte,byte)"/>, this method doesn't validate the parameters
-        /// and does not contain branching instructions, so it's well suited for use in tight loops as well.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void SetRange(ref uint value, byte start, byte length, uint flags)
-        {
-            value = SetRange(value, start, length, flags);
-        }
-
-        /// <summary>
-        /// Sets a bit field range within a target value.
-        /// </summary>
-        /// <param name="value">The initial <see cref="uint"/> value.</param>
-        /// <param name="start">The initial index of the range to extract (in [0, 31] range).</param>
-        /// <param name="length">The length of the range to extract (depends on <paramref name="start"/>).</param>
-        /// <param name="flags">The input flags to insert in the target range.</param>
-        /// <returns>The updated bit field value after setting the specified range.</returns>
-        /// <remarks>
-        /// Just like <see cref="ExtractRange(uint,byte,byte)"/>, this method doesn't validate the parameters
-        /// and does not contain branching instructions, so it's well suited for use in tight loops as well.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static uint SetRange(uint value, byte start, byte length, uint flags)
-        {
-            uint
-                highBits = (1u << length) - 1u,
-                loadMask = highBits << start,
-                storeMask = (flags & highBits) << start;
-
-#if NETCOREAPP3_1 || NET5_0
-            if (Bmi1.IsSupported)
-            {
-                return Bmi1.AndNot(loadMask, value) | storeMask;
-            }
-#endif
-
-            return (~loadMask & value) | storeMask;
-        }
-
-        /// <summary>
-        /// Checks whether or not a given bit is set.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value.</param>
-        /// <param name="n">The position of the bit to check (in [0, 63] range).</param>
-        /// <returns>Whether or not the n-th bit is set.</returns>
-        /// <remarks>
-        /// This method doesn't validate <paramref name="n"/> against the valid range.
-        /// If the parameter is not valid, the result will just be inconsistent.
-        /// Additionally, no conditional branches are used to retrieve the flag.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe bool HasFlag(ulong value, int n)
-        {
-            // Same logic as the uint version, see that for more info
-            byte flag = (byte)((value >> n) & 1);
-
-            return *(bool*)&flag;
-        }
-
-        /// <summary>
-        /// Checks whether or not a given bit is set in a given bitwise lookup table.
-        /// For more info, check the XML docs of the <see cref="HasLookupFlag(uint,int,int)"/> overload.
-        /// </summary>
-        /// <param name="table">The input lookup table to use.</param>
-        /// <param name="x">The input value to check.</param>
-        /// <param name="min">The minimum accepted value for <paramref name="x"/> (defaults to 0).</param>
-        /// <returns>Whether or not the corresponding flag for <paramref name="x"/> is set in <paramref name="table"/>.</returns>
-        /// <remarks>
-        /// For best results, as shown in the sample code, both <paramref name="table"/> and <paramref name="min"/>
-        /// should be compile-time constants, so that the JIT compiler will be able to produce more efficient code.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe bool HasLookupFlag(ulong table, int x, int min = 0)
-        {
-            int i = x - min;
-            bool isInRange = (uint)i < 64u;
-            byte byteFlag = *(byte*)&isInRange;
-            int
-                negativeFlag = byteFlag - 1,
-                mask = ~negativeFlag,
-                shift = unchecked((int)((table >> i) & 1)),
-                and = shift & mask;
-            byte result = unchecked((byte)and);
-            bool valid = *(bool*)&result;
-
-            return valid;
-        }
-
-        /// <summary>
-        /// Sets a bit to a specified value.
-        /// </summary>
-        /// <param name="value">The target <see cref="ulong"/> value.</param>
-        /// <param name="n">The position of the bit to set or clear (in [0, 63] range).</param>
-        /// <param name="flag">The value to assign to the target bit.</param>
-        /// <remarks>
-        /// Just like <see cref="HasFlag(ulong,int)"/>, this method doesn't validate <paramref name="n"/>
-        /// and does not contain branching instructions, so it's well suited for use in tight loops as well.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void SetFlag(ref ulong value, int n, bool flag)
-        {
-            value = SetFlag(value, n, flag);
-        }
-
-        /// <summary>
-        /// Sets a bit to a specified value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value.</param>
-        /// <param name="n">The position of the bit to set or clear (in [0, 63] range).</param>
-        /// <param name="flag">The value to assign to the target bit.</param>
-        /// <returns>An <see cref="ulong"/> value equal to <paramref name="value"/> except for the <paramref name="n"/>-th bit.</returns>
-        /// <remarks>
-        /// Just like <see cref="HasFlag(ulong,int)"/>, this method doesn't validate <paramref name="n"/>
-        /// and does not contain branching instructions, so it's well suited for use in tight loops as well.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe ulong SetFlag(ulong value, int n, bool flag)
-        {
-            ulong
-                bit = 1ul << n,
-                not = ~bit,
-                and = value & not;
-            bool copy = flag;
-            ulong flag64 = *(byte*)&copy,
-                shift = flag64 << n,
-                or = and | shift;
-
-            return or;
-        }
-
-        /// <summary>
-        /// Extracts a bit field range from a given value.
-        /// </summary>
-        /// <param name="value">The input <see cref="ulong"/> value.</param>
-        /// <param name="start">The initial index of the range to extract (in [0, 63] range).</param>
-        /// <param name="length">The length of the range to extract (depends on <paramref name="start"/>).</param>
-        /// <returns>The value of the extracted range within <paramref name="value"/>.</returns>
-        /// <remarks>
-        /// This method doesn't validate <paramref name="start"/> and <paramref name="length"/>.
-        /// If either parameter is not valid, the result will just be inconsistent. The method
-        /// should not be used to set all the bits at once, and it is not guaranteed to work in
-        /// that case, which would just be equivalent to assigning the <see cref="ulong"/> value.
-        /// Additionally, no conditional branches are used to retrieve the range.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ulong ExtractRange(ulong value, byte start, byte length)
-        {
-#if NETCOREAPP3_1 || NET5_0
-            if (Bmi1.X64.IsSupported)
-            {
-                return Bmi1.X64.BitFieldExtract(value, start, length);
-            }
-#endif
-
-            return (value >> start) & ((1ul << length) - 1ul);
-        }
-
-        /// <summary>
-        /// Sets a bit field range within a target value.
-        /// </summary>
-        /// <param name="value">The target <see cref="ulong"/> value.</param>
-        /// <param name="start">The initial index of the range to extract (in [0, 63] range).</param>
-        /// <param name="length">The length of the range to extract (depends on <paramref name="start"/>).</param>
-        /// <param name="flags">The input flags to insert in the target range.</param>
-        /// <remarks>
-        /// Just like <see cref="ExtractRange(ulong,byte,byte)"/>, this method doesn't validate the parameters
-        /// and does not contain branching instructions, so it's well suited for use in tight loops as well.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void SetRange(ref ulong value, byte start, byte length, ulong flags)
-        {
-            value = SetRange(value, start, length, flags);
-        }
-
-        /// <summary>
-        /// Sets a bit field range within a target value.
-        /// </summary>
-        /// <param name="value">The initial <see cref="ulong"/> value.</param>
-        /// <param name="start">The initial index of the range to extract (in [0, 63] range).</param>
-        /// <param name="length">The length of the range to extract (depends on <paramref name="start"/>).</param>
-        /// <param name="flags">The input flags to insert in the target range.</param>
-        /// <returns>The updated bit field value after setting the specified range.</returns>
-        /// <remarks>
-        /// Just like <see cref="ExtractRange(ulong,byte,byte)"/>, this method doesn't validate the parameters
-        /// and does not contain branching instructions, so it's well suited for use in tight loops as well.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ulong SetRange(ulong value, byte start, byte length, ulong flags)
-        {
-            ulong
-                highBits = (1ul << length) - 1ul,
-                loadMask = highBits << start,
-                storeMask = (flags & highBits) << start;
-
-#if NETCOREAPP3_1 || NET5_0
-            if (Bmi1.X64.IsSupported)
-            {
-                return Bmi1.X64.AndNot(loadMask, value) | storeMask;
-            }
-#endif
-
-            return (~loadMask & value) | storeMask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/HashCode{T}.cs b/Microsoft.Toolkit.HighPerformance/Helpers/HashCode{T}.cs
deleted file mode 100644
index 8b5e59ce34e..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/HashCode{T}.cs
+++ /dev/null
@@ -1,85 +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.
-
-#if !NETSTANDARD1_4
-
-using System;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Helpers.Internals;
-#if SPAN_RUNTIME_SUPPORT
-using RuntimeHelpers = System.Runtime.CompilerServices.RuntimeHelpers;
-#else
-using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-#endif
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers
-{
-    /// <summary>
-    /// Combines the hash code of sequences of <typeparamref name="T"/> values into a single hash code.
-    /// </summary>
-    /// <typeparam name="T">The type of values to hash.</typeparam>
-    /// <remarks>
-    /// The hash codes returned by the <see cref="Combine"/> method are only guaranteed to be repeatable for
-    /// the current execution session, just like with the available <see cref="HashCode"/> APIs.In other words,
-    /// hashing the same <see cref="ReadOnlySpan{T}"/> collection multiple times in the same process will always
-    /// result in the same hash code, while the same collection being hashed again from another process
-    /// (or another instance of the same process) is not guaranteed to result in the same final value.
-    /// For more info, see <see href="https://docs.microsoft.com/en-us/dotnet/api/system.object.gethashcode#remarks"/>.
-    /// </remarks>
-    public struct HashCode<T>
-        where T : notnull
-    {
-        /// <summary>
-        /// Gets a content hash from the input <see cref="ReadOnlySpan{T}"/> instance using the xxHash32 algorithm.
-        /// </summary>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance</param>
-        /// <returns>The xxHash32 value for the input <see cref="ReadOnlySpan{T}"/> instance</returns>
-        /// <remarks>The xxHash32 is only guaranteed to be deterministic within the scope of a single app execution</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int Combine(ReadOnlySpan<T> span)
-        {
-            int hash = CombineValues(span);
-
-            return HashCode.Combine(hash);
-        }
-
-        /// <summary>
-        /// Gets a content hash from the input <see cref="ReadOnlySpan{T}"/> instance.
-        /// </summary>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance</param>
-        /// <returns>The hash code for the input <see cref="ReadOnlySpan{T}"/> instance</returns>
-        /// <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)
-        {
-            ref T r0 = ref MemoryMarshal.GetReference(span);
-
-            // If typeof(T) is not unmanaged, iterate over all the items one by one.
-            // This check is always known in advance either by the JITter or by the AOT
-            // compiler, so this branch will never actually be executed by the code.
-            if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
-            {
-                return SpanHelper.GetDjb2HashCode(ref r0, (nint)(uint)span.Length);
-            }
-
-            // 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);
-            nint length = (nint)((uint)span.Length * (uint)Unsafe.SizeOf<T>());
-
-            return SpanHelper.GetDjb2LikeByteHash(ref rb, length);
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/BitOperations.cs b/Microsoft.Toolkit.HighPerformance/Helpers/Internals/BitOperations.cs
deleted file mode 100644
index 9d326ec1c14..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/BitOperations.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.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-#if NETCOREAPP3_1 || NET5_0
-using static System.Numerics.BitOperations;
-#endif
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers.Internals
-{
-    /// <summary>
-    /// Utility methods for intrinsic bit-twiddling operations. The methods use hardware intrinsics
-    /// when available on the underlying platform, otherwise they use optimized software fallbacks.
-    /// </summary>
-    internal static class BitOperations
-    {
-        /// <summary>
-        /// Rounds up an <see cref="int"/> value to a power of 2.
-        /// </summary>
-        /// <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)]
-        public static int RoundUpPowerOfTwo(int x)
-        {
-#if NETCOREAPP3_1 || NET5_0
-            return 1 << (32 - 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
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/RefEnumerableHelper.cs b/Microsoft.Toolkit.HighPerformance/Helpers/Internals/RefEnumerableHelper.cs
deleted file mode 100644
index e054fbd8bdf..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/RefEnumerableHelper.cs
+++ /dev/null
@@ -1,267 +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.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers.Internals
-{
-    /// <summary>
-    /// Helpers to process sequences of values by reference with a given step.
-    /// </summary>
-    internal static class RefEnumerableHelper
-    {
-        /// <summary>
-        /// Clears a target memory area.
-        /// </summary>
-        /// <typeparam name="T">The type of values to clear.</typeparam>
-        /// <param name="r0">A <typeparamref name="T"/> reference to the start of the memory area.</param>
-        /// <param name="length">The number of items in the memory area.</param>
-        /// <param name="step">The number of items between each consecutive target value.</param>
-        public static void Clear<T>(ref T r0, nint length, nint step)
-        {
-            nint offset = 0;
-
-            // Main loop with 8 unrolled iterations
-            while (length >= 8)
-            {
-                Unsafe.Add(ref r0, offset) = default!;
-                Unsafe.Add(ref r0, offset += step) = default!;
-                Unsafe.Add(ref r0, offset += step) = default!;
-                Unsafe.Add(ref r0, offset += step) = default!;
-                Unsafe.Add(ref r0, offset += step) = default!;
-                Unsafe.Add(ref r0, offset += step) = default!;
-                Unsafe.Add(ref r0, offset += step) = default!;
-                Unsafe.Add(ref r0, offset += step) = default!;
-
-                length -= 8;
-                offset += step;
-            }
-
-            if (length >= 4)
-            {
-                Unsafe.Add(ref r0, offset) = default!;
-                Unsafe.Add(ref r0, offset += step) = default!;
-                Unsafe.Add(ref r0, offset += step) = default!;
-                Unsafe.Add(ref r0, offset += step) = default!;
-
-                length -= 4;
-                offset += step;
-            }
-
-            // Clear the remaining values
-            while (length > 0)
-            {
-                Unsafe.Add(ref r0, offset) = default!;
-
-                length -= 1;
-                offset += step;
-            }
-        }
-
-        /// <summary>
-        /// Copies a sequence of discontiguous items from one memory area to another.
-        /// </summary>
-        /// <typeparam name="T">The type of items to copy.</typeparam>
-        /// <param name="sourceRef">The source reference to copy from.</param>
-        /// <param name="destinationRef">The target reference to copy to.</param>
-        /// <param name="length">The total number of items to copy.</param>
-        /// <param name="sourceStep">The step between consecutive items in the memory area pointed to by <paramref name="sourceRef"/>.</param>
-        public static void CopyTo<T>(ref T sourceRef, ref T destinationRef, nint length, nint sourceStep)
-        {
-            nint
-                sourceOffset = 0,
-                destinationOffset = 0;
-
-            while (length >= 8)
-            {
-                Unsafe.Add(ref destinationRef, destinationOffset + 0) = Unsafe.Add(ref sourceRef, sourceOffset);
-                Unsafe.Add(ref destinationRef, destinationOffset + 1) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset + 2) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset + 3) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset + 4) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset + 5) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset + 6) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset + 7) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-
-                length -= 8;
-                sourceOffset += sourceStep;
-                destinationOffset += 8;
-            }
-
-            if (length >= 4)
-            {
-                Unsafe.Add(ref destinationRef, destinationOffset + 0) = Unsafe.Add(ref sourceRef, sourceOffset);
-                Unsafe.Add(ref destinationRef, destinationOffset + 1) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset + 2) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset + 3) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-
-                length -= 4;
-                sourceOffset += sourceStep;
-                destinationOffset += 4;
-            }
-
-            while (length > 0)
-            {
-                Unsafe.Add(ref destinationRef, destinationOffset) = Unsafe.Add(ref sourceRef, sourceOffset);
-
-                length -= 1;
-                sourceOffset += sourceStep;
-                destinationOffset += 1;
-            }
-        }
-
-        /// <summary>
-        /// Copies a sequence of discontiguous items from one memory area to another.
-        /// </summary>
-        /// <typeparam name="T">The type of items to copy.</typeparam>
-        /// <param name="sourceRef">The source reference to copy from.</param>
-        /// <param name="destinationRef">The target reference to copy to.</param>
-        /// <param name="length">The total number of items to copy.</param>
-        /// <param name="sourceStep">The step between consecutive items in the memory area pointed to by <paramref name="sourceRef"/>.</param>
-        /// <param name="destinationStep">The step between consecutive items in the memory area pointed to by <paramref name="destinationRef"/>.</param>
-        public static void CopyTo<T>(ref T sourceRef, ref T destinationRef, nint length, nint sourceStep, nint destinationStep)
-        {
-            nint
-                sourceOffset = 0,
-                destinationOffset = 0;
-
-            while (length >= 8)
-            {
-                Unsafe.Add(ref destinationRef, destinationOffset) = Unsafe.Add(ref sourceRef, sourceOffset);
-                Unsafe.Add(ref destinationRef, destinationOffset += destinationStep) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset += destinationStep) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset += destinationStep) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset += destinationStep) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset += destinationStep) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset += destinationStep) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset += destinationStep) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-
-                length -= 8;
-                sourceOffset += sourceStep;
-                destinationOffset += destinationStep;
-            }
-
-            if (length >= 4)
-            {
-                Unsafe.Add(ref destinationRef, destinationOffset) = Unsafe.Add(ref sourceRef, sourceOffset);
-                Unsafe.Add(ref destinationRef, destinationOffset += destinationStep) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset += destinationStep) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-                Unsafe.Add(ref destinationRef, destinationOffset += destinationStep) = Unsafe.Add(ref sourceRef, sourceOffset += sourceStep);
-
-                length -= 4;
-                sourceOffset += sourceStep;
-                destinationOffset += destinationStep;
-            }
-
-            while (length > 0)
-            {
-                Unsafe.Add(ref destinationRef, destinationOffset) = Unsafe.Add(ref sourceRef, sourceOffset);
-
-                length -= 1;
-                sourceOffset += sourceStep;
-                destinationOffset += destinationStep;
-            }
-        }
-
-        /// <summary>
-        /// Copies a sequence of discontiguous items from one memory area to another. This mirrors
-        /// <see cref="CopyTo{T}(ref T,ref T,nint,nint)"/>, but <paramref name="sourceStep"/> refers to <paramref name="destinationRef"/> instead.
-        /// </summary>
-        /// <typeparam name="T">The type of items to copy.</typeparam>
-        /// <param name="sourceRef">The source reference to copy from.</param>
-        /// <param name="destinationRef">The target reference to copy to.</param>
-        /// <param name="length">The total number of items to copy.</param>
-        /// <param name="sourceStep">The step between consecutive items in the memory area pointed to by <paramref name="sourceRef"/>.</param>
-        public static void CopyFrom<T>(ref T sourceRef, ref T destinationRef, nint length, nint sourceStep)
-        {
-            nint
-                sourceOffset = 0,
-                destinationOffset = 0;
-
-            while (length >= 8)
-            {
-                Unsafe.Add(ref destinationRef, destinationOffset) = Unsafe.Add(ref sourceRef, sourceOffset);
-                Unsafe.Add(ref destinationRef, destinationOffset += sourceStep) = Unsafe.Add(ref sourceRef, sourceOffset + 1);
-                Unsafe.Add(ref destinationRef, destinationOffset += sourceStep) = Unsafe.Add(ref sourceRef, sourceOffset + 2);
-                Unsafe.Add(ref destinationRef, destinationOffset += sourceStep) = Unsafe.Add(ref sourceRef, sourceOffset + 3);
-                Unsafe.Add(ref destinationRef, destinationOffset += sourceStep) = Unsafe.Add(ref sourceRef, sourceOffset + 4);
-                Unsafe.Add(ref destinationRef, destinationOffset += sourceStep) = Unsafe.Add(ref sourceRef, sourceOffset + 5);
-                Unsafe.Add(ref destinationRef, destinationOffset += sourceStep) = Unsafe.Add(ref sourceRef, sourceOffset + 6);
-                Unsafe.Add(ref destinationRef, destinationOffset += sourceStep) = Unsafe.Add(ref sourceRef, sourceOffset + 7);
-
-                length -= 8;
-                sourceOffset += 8;
-                destinationOffset += sourceStep;
-            }
-
-            if (length >= 4)
-            {
-                Unsafe.Add(ref destinationRef, destinationOffset) = Unsafe.Add(ref sourceRef, sourceOffset);
-                Unsafe.Add(ref destinationRef, destinationOffset += sourceStep) = Unsafe.Add(ref sourceRef, sourceOffset + 1);
-                Unsafe.Add(ref destinationRef, destinationOffset += sourceStep) = Unsafe.Add(ref sourceRef, sourceOffset + 2);
-                Unsafe.Add(ref destinationRef, destinationOffset += sourceStep) = Unsafe.Add(ref sourceRef, sourceOffset + 3);
-
-                length -= 4;
-                sourceOffset += 4;
-                destinationOffset += sourceStep;
-            }
-
-            while (length > 0)
-            {
-                Unsafe.Add(ref destinationRef, destinationOffset) = Unsafe.Add(ref sourceRef, sourceOffset);
-
-                length -= 1;
-                sourceOffset += 1;
-                destinationOffset += sourceStep;
-            }
-        }
-
-        /// <summary>
-        /// Fills a target memory area.
-        /// </summary>
-        /// <typeparam name="T">The type of values to fill.</typeparam>
-        /// <param name="r0">A <typeparamref name="T"/> reference to the start of the memory area.</param>
-        /// <param name="length">The number of items in the memory area.</param>
-        /// <param name="step">The number of items between each consecutive target value.</param>
-        /// <param name="value">The value to assign to every item in the target memory area.</param>
-        public static void Fill<T>(ref T r0, nint length, nint step, T value)
-        {
-            nint offset = 0;
-
-            while (length >= 8)
-            {
-                Unsafe.Add(ref r0, offset) = value;
-                Unsafe.Add(ref r0, offset += step) = value;
-                Unsafe.Add(ref r0, offset += step) = value;
-                Unsafe.Add(ref r0, offset += step) = value;
-                Unsafe.Add(ref r0, offset += step) = value;
-                Unsafe.Add(ref r0, offset += step) = value;
-                Unsafe.Add(ref r0, offset += step) = value;
-                Unsafe.Add(ref r0, offset += step) = value;
-
-                length -= 8;
-                offset += step;
-            }
-
-            if (length >= 4)
-            {
-                Unsafe.Add(ref r0, offset) = value;
-                Unsafe.Add(ref r0, offset += step) = value;
-                Unsafe.Add(ref r0, offset += step) = value;
-                Unsafe.Add(ref r0, offset += step) = value;
-
-                length -= 4;
-                offset += step;
-            }
-
-            while (length > 0)
-            {
-                Unsafe.Add(ref r0, offset) = value;
-
-                length -= 1;
-                offset += step;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/RuntimeHelpers.cs b/Microsoft.Toolkit.HighPerformance/Helpers/Internals/RuntimeHelpers.cs
deleted file mode 100644
index 49817edc31a..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/RuntimeHelpers.cs
+++ /dev/null
@@ -1,304 +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.
-
-#pragma warning disable SA1512
-
-// The portable implementation in this type is originally from CoreFX.
-// See https://github.com/dotnet/corefx/blob/release/2.1/src/System.Memory/src/System/SpanHelpers.cs.
-
-using System;
-using System.Diagnostics.Contracts;
-#if !SPAN_RUNTIME_SUPPORT
-using System.Reflection;
-#endif
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers.Internals
-{
-    /// <summary>
-    /// A helper class that with utility methods for dealing with references, and other low-level details.
-    /// It also contains some APIs that act as polyfills for .NET Standard 2.0 and below.
-    /// </summary>
-    internal static class RuntimeHelpers
-    {
-        /// <summary>
-        /// Converts a length of items from one size to another (rounding towards zero).
-        /// </summary>
-        /// <typeparam name="TFrom">The source type of items.</typeparam>
-        /// <typeparam name="TTo">The target type of items.</typeparam>
-        /// <param name="length">The input length to convert.</param>
-        /// <returns>The converted length for the specified argument and types.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe int ConvertLength<TFrom, TTo>(int length)
-            where TFrom : unmanaged
-            where TTo : unmanaged
-        {
-            if (sizeof(TFrom) == sizeof(TTo))
-            {
-                return length;
-            }
-            else if (sizeof(TFrom) == 1)
-            {
-                return (int)((uint)length / (uint)sizeof(TTo));
-            }
-            else
-            {
-                ulong targetLength = (ulong)(uint)length * (uint)sizeof(TFrom) / (uint)sizeof(TTo);
-
-                return checked((int)targetLength);
-            }
-        }
-
-        /// <summary>
-        /// Gets the length of a given array as a native integer.
-        /// </summary>
-        /// <typeparam name="T">The type of values in the array.</typeparam>
-        /// <param name="array">The input <see cref="Array"/> instance.</param>
-        /// <returns>The total length of <paramref name="array"/> as a native integer.</returns>
-        /// <remarks>
-        /// This method is needed because this expression is not inlined correctly if the target array
-        /// is only visible as a non-generic <see cref="Array"/> instance, because the C# compiler will
-        /// not be able to emit the <see langword="ldlen"/> opcode instead of calling the right method.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static nint GetArrayNativeLength<T>(T[] array)
-        {
-#if NETSTANDARD1_4
-            // .NET Standard 1.4 doesn't include the API to get the long length, so
-            // we just cast the length and throw in case the array is larger than
-            // int.MaxValue. There's not much we can do in this specific case.
-            return (nint)(uint)array.Length;
-#else
-            return (nint)array.LongLength;
-#endif
-        }
-
-        /// <summary>
-        /// Gets the length of a given array as a native integer.
-        /// </summary>
-        /// <param name="array">The input <see cref="Array"/> instance.</param>
-        /// <returns>The total length of <paramref name="array"/> as a native integer.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static nint GetArrayNativeLength(Array array)
-        {
-#if NETSTANDARD1_4
-            return (nint)(uint)array.Length;
-#else
-            return (nint)array.LongLength;
-#endif
-        }
-
-        /// <summary>
-        /// Gets the byte offset to the first <typeparamref name="T"/> element in a SZ array.
-        /// </summary>
-        /// <typeparam name="T">The type of values in the array.</typeparam>
-        /// <returns>The byte offset to the first <typeparamref name="T"/> element in a SZ array.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static IntPtr GetArrayDataByteOffset<T>()
-        {
-            return TypeInfo<T>.ArrayDataByteOffset;
-        }
-
-        /// <summary>
-        /// Gets the byte offset to the first <typeparamref name="T"/> element in a 2D array.
-        /// </summary>
-        /// <typeparam name="T">The type of values in the array.</typeparam>
-        /// <returns>The byte offset to the first <typeparamref name="T"/> element in a 2D array.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static IntPtr GetArray2DDataByteOffset<T>()
-        {
-            return TypeInfo<T>.Array2DDataByteOffset;
-        }
-
-        /// <summary>
-        /// Gets the byte offset to the first <typeparamref name="T"/> element in a 3D array.
-        /// </summary>
-        /// <typeparam name="T">The type of values in the array.</typeparam>
-        /// <returns>The byte offset to the first <typeparamref name="T"/> element in a 3D array.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static IntPtr GetArray3DDataByteOffset<T>()
-        {
-            return TypeInfo<T>.Array3DDataByteOffset;
-        }
-
-#if !SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Gets a byte offset describing a portable pinnable reference. This can either be an
-        /// interior pointer into some object data (described with a valid <see cref="object"/> reference
-        /// and a reference to some of its data), or a raw pointer (described with a <see langword="null"/>
-        /// reference to an <see cref="object"/>, and a reference that is assumed to refer to pinned data).
-        /// </summary>
-        /// <typeparam name="T">The type of field being referenced.</typeparam>
-        /// <param name="obj">The input <see cref="object"/> hosting the target field.</param>
-        /// <param name="data">A reference to a target field of type <typeparamref name="T"/> within <paramref name="obj"/>.</param>
-        /// <returns>
-        /// 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"/>, or the value of the raw pointer passed as a tracked reference.
-        /// </returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe IntPtr GetObjectDataOrReferenceByteOffset<T>(object? obj, ref T data)
-        {
-            if (obj is null)
-            {
-                return (IntPtr)Unsafe.AsPointer(ref data);
-            }
-
-            return ObjectMarshal.DangerousGetObjectDataByteOffset(obj, ref data);
-        }
-
-        /// <summary>
-        /// Gets a reference from data describing a portable pinnable reference. This can either be an
-        /// interior pointer into some object data (described with a valid <see cref="object"/> reference
-        /// and a byte offset into its data), or a raw pointer (described with a <see langword="null"/>
-        /// reference to an <see cref="object"/>, and a byte offset representing the value of the raw pointer).
-        /// </summary>
-        /// <typeparam name="T">The type of reference to retrieve.</typeparam>
-        /// <param name="obj">The input <see cref="object"/> hosting the target field.</param>
-        /// <param name="offset">The input byte offset for the <typeparamref name="T"/> reference to retrieve.</param>
-        /// <returns>A <typeparamref name="T"/> reference matching the given parameters.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static unsafe ref T GetObjectDataAtOffsetOrPointerReference<T>(object? obj, IntPtr offset)
-        {
-            if (obj is null)
-            {
-                return ref Unsafe.AsRef<T>((void*)offset);
-            }
-
-            return ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(obj, offset);
-        }
-
-        /// <summary>
-        /// Checks whether or not a given type is a reference type or contains references.
-        /// </summary>
-        /// <typeparam name="T">The type to check.</typeparam>
-        /// <returns>Whether or not <typeparamref name="T"/> respects the <see langword="unmanaged"/> constraint.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool IsReferenceOrContainsReferences<T>()
-        {
-            return TypeInfo<T>.IsReferenceOrContainsReferences;
-        }
-
-        /// <summary>
-        /// Implements the logic for <see cref="IsReferenceOrContainsReferences{T}"/>.
-        /// </summary>
-        /// <param name="type">The current type to check.</param>
-        /// <returns>Whether or not <paramref name="type"/> is a reference type or contains references.</returns>
-        [Pure]
-        private static bool IsReferenceOrContainsReferences(Type type)
-        {
-            // Common case, for primitive types
-            if (type.GetTypeInfo().IsPrimitive)
-            {
-                return false;
-            }
-
-            if (!type.GetTypeInfo().IsValueType)
-            {
-                return true;
-            }
-
-            // Check if the type is Nullable<T>
-            if (Nullable.GetUnderlyingType(type) is Type nullableType)
-            {
-                type = nullableType;
-            }
-
-            if (type.GetTypeInfo().IsEnum)
-            {
-                return false;
-            }
-
-            // Complex struct, recursively inspect all fields
-            foreach (FieldInfo field in type.GetTypeInfo().DeclaredFields)
-            {
-                if (field.IsStatic)
-                {
-                    continue;
-                }
-
-                if (IsReferenceOrContainsReferences(field.FieldType))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-#endif
-
-        /// <summary>
-        /// A private generic class to preload type info for arbitrary runtime types.
-        /// </summary>
-        /// <typeparam name="T">The type to load info for.</typeparam>
-        private static class TypeInfo<T>
-        {
-            /// <summary>
-            /// The byte offset to the first <typeparamref name="T"/> element in a SZ array.
-            /// </summary>
-            public static readonly IntPtr ArrayDataByteOffset = MeasureArrayDataByteOffset();
-
-            /// <summary>
-            /// The byte offset to the first <typeparamref name="T"/> element in a 2D array.
-            /// </summary>
-            public static readonly IntPtr Array2DDataByteOffset = MeasureArray2DDataByteOffset();
-
-            /// <summary>
-            /// The byte offset to the first <typeparamref name="T"/> element in a 3D array.
-            /// </summary>
-            public static readonly IntPtr Array3DDataByteOffset = MeasureArray3DDataByteOffset();
-
-#if !SPAN_RUNTIME_SUPPORT
-            /// <summary>
-            /// Indicates whether <typeparamref name="T"/> does not respect the <see langword="unmanaged"/> constraint.
-            /// </summary>
-            public static readonly bool IsReferenceOrContainsReferences = IsReferenceOrContainsReferences(typeof(T));
-#endif
-
-            /// <summary>
-            /// Computes the value for <see cref="ArrayDataByteOffset"/>.
-            /// </summary>
-            /// <returns>The value of <see cref="ArrayDataByteOffset"/> for the current runtime.</returns>
-            [Pure]
-            private static IntPtr MeasureArrayDataByteOffset()
-            {
-                var array = new T[1];
-
-                return ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array[0]);
-            }
-
-            /// <summary>
-            /// Computes the value for <see cref="Array2DDataByteOffset"/>.
-            /// </summary>
-            /// <returns>The value of <see cref="Array2DDataByteOffset"/> for the current runtime.</returns>
-            [Pure]
-            private static IntPtr MeasureArray2DDataByteOffset()
-            {
-                var array = new T[1, 1];
-
-                return ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array[0, 0]);
-            }
-
-            /// <summary>
-            /// Computes the value for <see cref="Array3DDataByteOffset"/>.
-            /// </summary>
-            /// <returns>The value of <see cref="Array3DDataByteOffset"/> for the current runtime.</returns>
-            [Pure]
-            private static IntPtr MeasureArray3DDataByteOffset()
-            {
-                var array = new T[1, 1, 1];
-
-                return ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array[0, 0, 0]);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Count.cs b/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Count.cs
deleted file mode 100644
index 8122a4bca46..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Count.cs
+++ /dev/null
@@ -1,368 +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.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers.Internals
-{
-    /// <summary>
-    /// Helpers to process sequences of values by reference.
-    /// </summary>
-    internal static partial class SpanHelper
-    {
-        /// <summary>
-        /// Counts the number of occurrences of a given value into a target search space.
-        /// </summary>
-        /// <param name="r0">A <typeparamref name="T"/> reference to the start of the search space.</param>
-        /// <param name="length">The number of items in the search space.</param>
-        /// <param name="value">The <typeparamref name="T"/> value to look for.</param>
-        /// <typeparam name="T">The type of value to look for.</typeparam>
-        /// <returns>The number of occurrences of <paramref name="value"/> in the search space</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static nint Count<T>(ref T r0, nint length, T value)
-            where T : IEquatable<T>
-        {
-            if (!Vector.IsHardwareAccelerated)
-            {
-                return CountSequential(ref r0, length, value);
-            }
-
-            // Special vectorized version when using a supported type
-            if (typeof(T) == typeof(byte) ||
-                typeof(T) == typeof(sbyte) ||
-                typeof(T) == typeof(bool))
-            {
-                ref sbyte r1 = ref Unsafe.As<T, sbyte>(ref r0);
-                sbyte target = Unsafe.As<T, sbyte>(ref value);
-
-                return CountSimd(ref r1, length, target);
-            }
-
-            if (typeof(T) == typeof(char) ||
-                typeof(T) == typeof(ushort) ||
-                typeof(T) == typeof(short))
-            {
-                ref short r1 = ref Unsafe.As<T, short>(ref r0);
-                short target = Unsafe.As<T, short>(ref value);
-
-                return CountSimd(ref r1, length, target);
-            }
-
-            if (typeof(T) == typeof(int) ||
-                typeof(T) == typeof(uint))
-            {
-                ref int r1 = ref Unsafe.As<T, int>(ref r0);
-                int target = Unsafe.As<T, int>(ref value);
-
-                return CountSimd(ref r1, length, target);
-            }
-
-            if (typeof(T) == typeof(long) ||
-                typeof(T) == typeof(ulong))
-            {
-                ref long r1 = ref Unsafe.As<T, long>(ref r0);
-                long target = Unsafe.As<T, long>(ref value);
-
-                return CountSimd(ref r1, length, target);
-            }
-
-            return CountSequential(ref r0, length, value);
-        }
-
-        /// <summary>
-        /// Implements <see cref="Count{T}"/> with a sequential search.
-        /// </summary>
-        [Pure]
-        private static nint CountSequential<T>(ref T r0, nint length, T value)
-            where T : IEquatable<T>
-        {
-            nint
-                result = 0,
-                offset = 0;
-
-            // Main loop with 8 unrolled iterations
-            while (length >= 8)
-            {
-                result += Unsafe.Add(ref r0, offset + 0).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 1).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 2).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 3).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 4).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 5).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 6).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 7).Equals(value).ToByte();
-
-                length -= 8;
-                offset += 8;
-            }
-
-            if (length >= 4)
-            {
-                result += Unsafe.Add(ref r0, offset + 0).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 1).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 2).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 3).Equals(value).ToByte();
-
-                length -= 4;
-                offset += 4;
-            }
-
-            // Iterate over the remaining values and count those that match
-            while (length > 0)
-            {
-                result += Unsafe.Add(ref r0, offset).Equals(value).ToByte();
-
-                length -= 1;
-                offset += 1;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Implements <see cref="Count{T}"/> with a vectorized search.
-        /// </summary>
-        [Pure]
-        private static nint CountSimd<T>(ref T r0, nint length, T value)
-            where T : unmanaged, IEquatable<T>
-        {
-            nint
-                result = 0,
-                offset = 0;
-
-            // Skip the initialization overhead if there are not enough items
-            if (length >= Vector<T>.Count)
-            {
-                var vc = new Vector<T>(value);
-
-                do
-                {
-                    // Calculate the maximum sequential area that can be processed in
-                    // one pass without the risk of numeric overflow in the dot product
-                    // to sum the partial results. We also backup the current offset to
-                    // be able to track how many items have been processed, which lets
-                    // us avoid updating a third counter (length) in the loop body.
-                    nint
-                        max = GetUpperBound<T>(),
-                        chunkLength = length <= max ? length : max,
-                        initialOffset = offset;
-
-                    var partials = Vector<T>.Zero;
-
-                    // Unrolled vectorized loop, with 8 unrolled iterations. We only run this when the
-                    // current type T is at least 2 bytes in size, otherwise the average chunk length
-                    // would always be too small to be able to trigger the unrolled loop, and the overall
-                    // performance would just be slightly worse due to the additional conditional branches.
-                    if (typeof(T) != typeof(sbyte))
-                    {
-                        while (chunkLength >= Vector<T>.Count * 8)
-                        {
-                            ref T ri0 = ref Unsafe.Add(ref r0, offset + (Vector<T>.Count * 0));
-                            var vi0 = Unsafe.As<T, Vector<T>>(ref ri0);
-                            var ve0 = Vector.Equals(vi0, vc);
-
-                            partials -= ve0;
-
-                            ref T ri1 = ref Unsafe.Add(ref r0, offset + (Vector<T>.Count * 1));
-                            var vi1 = Unsafe.As<T, Vector<T>>(ref ri1);
-                            var ve1 = Vector.Equals(vi1, vc);
-
-                            partials -= ve1;
-
-                            ref T ri2 = ref Unsafe.Add(ref r0, offset + (Vector<T>.Count * 2));
-                            var vi2 = Unsafe.As<T, Vector<T>>(ref ri2);
-                            var ve2 = Vector.Equals(vi2, vc);
-
-                            partials -= ve2;
-
-                            ref T ri3 = ref Unsafe.Add(ref r0, offset + (Vector<T>.Count * 3));
-                            var vi3 = Unsafe.As<T, Vector<T>>(ref ri3);
-                            var ve3 = Vector.Equals(vi3, vc);
-
-                            partials -= ve3;
-
-                            ref T ri4 = ref Unsafe.Add(ref r0, offset + (Vector<T>.Count * 4));
-                            var vi4 = Unsafe.As<T, Vector<T>>(ref ri4);
-                            var ve4 = Vector.Equals(vi4, vc);
-
-                            partials -= ve4;
-
-                            ref T ri5 = ref Unsafe.Add(ref r0, offset + (Vector<T>.Count * 5));
-                            var vi5 = Unsafe.As<T, Vector<T>>(ref ri5);
-                            var ve5 = Vector.Equals(vi5, vc);
-
-                            partials -= ve5;
-
-                            ref T ri6 = ref Unsafe.Add(ref r0, offset + (Vector<T>.Count * 6));
-                            var vi6 = Unsafe.As<T, Vector<T>>(ref ri6);
-                            var ve6 = Vector.Equals(vi6, vc);
-
-                            partials -= ve6;
-
-                            ref T ri7 = ref Unsafe.Add(ref r0, offset + (Vector<T>.Count * 7));
-                            var vi7 = Unsafe.As<T, Vector<T>>(ref ri7);
-                            var ve7 = Vector.Equals(vi7, vc);
-
-                            partials -= ve7;
-
-                            chunkLength -= Vector<T>.Count * 8;
-                            offset += Vector<T>.Count * 8;
-                        }
-                    }
-
-                    while (chunkLength >= Vector<T>.Count)
-                    {
-                        ref T ri = ref Unsafe.Add(ref r0, offset);
-
-                        // Load the current Vector<T> register, and then use
-                        // Vector.Equals to check for matches. This API sets the
-                        // values corresponding to matching pairs to all 1s.
-                        // Since the input type is guaranteed to always be signed,
-                        // this means that a value with all 1s represents -1, as
-                        // signed numbers are represented in two's complement.
-                        // So we can just subtract this intermediate value to the
-                        // partial results, which effectively sums 1 for each match.
-                        var vi = Unsafe.As<T, Vector<T>>(ref ri);
-                        var ve = Vector.Equals(vi, vc);
-
-                        partials -= ve;
-
-                        chunkLength -= Vector<T>.Count;
-                        offset += Vector<T>.Count;
-                    }
-
-                    result += CastToNativeInt(Vector.Dot(partials, Vector<T>.One));
-                    length -= offset - initialOffset;
-                }
-                while (length >= Vector<T>.Count);
-            }
-
-            // Optional 8 unrolled iterations. This is only done when a single SIMD
-            // register can contain over 8 values of the current type, as otherwise
-            // there could never be enough items left after the vectorized path
-            if (Vector<T>.Count > 8 &&
-                length >= 8)
-            {
-                result += Unsafe.Add(ref r0, offset + 0).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 1).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 2).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 3).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 4).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 5).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 6).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 7).Equals(value).ToByte();
-
-                length -= 8;
-                offset += 8;
-            }
-
-            // Optional 4 unrolled iterations
-            if (Vector<T>.Count > 4 &&
-                length >= 4)
-            {
-                result += Unsafe.Add(ref r0, offset + 0).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 1).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 2).Equals(value).ToByte();
-                result += Unsafe.Add(ref r0, offset + 3).Equals(value).ToByte();
-
-                length -= 4;
-                offset += 4;
-            }
-
-            // Iterate over the remaining values and count those that match
-            while (length > 0)
-            {
-                result += Unsafe.Add(ref r0, offset).Equals(value).ToByte();
-
-                length -= 1;
-                offset += 1;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Gets the upper bound for partial sums with a given <typeparamref name="T"/> parameter.
-        /// </summary>
-        /// <typeparam name="T">The type argument currently in use.</typeparam>
-        /// <returns>The native <see cref="int"/> value representing the upper bound.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static unsafe nint GetUpperBound<T>()
-            where T : unmanaged
-        {
-            if (typeof(T) == typeof(sbyte))
-            {
-                return sbyte.MaxValue;
-            }
-
-            if (typeof(T) == typeof(short))
-            {
-                return short.MaxValue;
-            }
-
-            if (typeof(T) == typeof(int))
-            {
-                return int.MaxValue;
-            }
-
-            if (typeof(T) == typeof(long))
-            {
-                if (sizeof(nint) == sizeof(int))
-                {
-                    return int.MaxValue;
-                }
-
-                // If we are on a 64 bit architecture and we are counting with a SIMD vector of 64
-                // bit values, we can use long.MaxValue as the upper bound, as a native integer will
-                // be able to contain such a value with no overflows. This will allow the count tight
-                // loop to process all the items in the target area in a single pass (except the mod).
-                // The (void*) cast is necessary to ensure the right constant is produced on runtimes
-                // before .NET 5 that don't natively support C# 9. For instance, removing that (void*)
-                // cast results in the value 0xFFFFFFFFFFFFFFFF (-1) instead of 0x7FFFFFFFFFFFFFFFF.
-                return (nint)(void*)long.MaxValue;
-            }
-
-            throw null!;
-        }
-
-        /// <summary>
-        /// Casts a value of a given type to a native <see cref="int"/>.
-        /// </summary>
-        /// <typeparam name="T">The input type to cast.</typeparam>
-        /// <param name="value">The input <typeparamref name="T"/> value to cast to native <see cref="int"/>.</param>
-        /// <returns>The native <see cref="int"/> cast of <paramref name="value"/>.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static nint CastToNativeInt<T>(T value)
-            where T : unmanaged
-        {
-            if (typeof(T) == typeof(sbyte))
-            {
-                return (byte)(sbyte)(object)value;
-            }
-
-            if (typeof(T) == typeof(short))
-            {
-                return (ushort)(short)(object)value;
-            }
-
-            if (typeof(T) == typeof(int))
-            {
-                return (nint)(uint)(int)(object)value;
-            }
-
-            if (typeof(T) == typeof(long))
-            {
-                return (nint)(ulong)(long)(object)value;
-            }
-
-            throw null!;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Hash.cs b/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Hash.cs
deleted file mode 100644
index a113d4c130d..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Hash.cs
+++ /dev/null
@@ -1,315 +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.Diagnostics.Contracts;
-using System.Numerics;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers.Internals
-{
-    /// <summary>
-    /// Helpers to process sequences of values by reference.
-    /// </summary>
-    internal static partial class SpanHelper
-    {
-        /// <summary>
-        /// Calculates the djb2 hash for the target sequence of items of a given type.
-        /// </summary>
-        /// <typeparam name="T">The type of items to hash.</typeparam>
-        /// <param name="r0">The reference to the target memory area to hash.</param>
-        /// <param name="length">The number of items to hash.</param>
-        /// <returns>The Djb2 value for the input sequence of items.</returns>
-        [Pure]
-        public static int GetDjb2HashCode<T>(ref T r0, nint length)
-            where T : notnull
-        {
-            int hash = 5381;
-            nint offset = 0;
-
-            while (length >= 8)
-            {
-                // Doing a left shift by 5 and adding is equivalent to multiplying by 33.
-                // This is preferred for performance reasons, as when working with integer
-                // values most CPUs have higher latency for multiplication operations
-                // compared to a simple shift and add. For more info on this, see the
-                // details for imul, shl, add: https://gmplib.org/~tege/x86-timing.pdf.
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset + 0).GetHashCode());
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset + 1).GetHashCode());
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset + 2).GetHashCode());
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset + 3).GetHashCode());
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset + 4).GetHashCode());
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset + 5).GetHashCode());
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset + 6).GetHashCode());
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset + 7).GetHashCode());
-
-                length -= 8;
-                offset += 8;
-            }
-
-            if (length >= 4)
-            {
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset + 0).GetHashCode());
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset + 1).GetHashCode());
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset + 2).GetHashCode());
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset + 3).GetHashCode());
-
-                length -= 4;
-                offset += 4;
-            }
-
-            while (length > 0)
-            {
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset).GetHashCode());
-
-                length -= 1;
-                offset += 1;
-            }
-
-            return hash;
-        }
-
-        /// <summary>
-        /// Gets a content hash from a given memory area.
-        /// </summary>
-        /// <param name="r0">A <see cref="byte"/> reference to the start of the memory area.</param>
-        /// <param name="length">The size in bytes of the memory area.</param>
-        /// <returns>The hash code for the contents of the source memory area.</returns>
-        /// <remarks>
-        /// While this method is similar to <see cref="GetDjb2HashCode{T}"/> and can in some cases
-        /// produce the same output for a given memory area, it is not guaranteed to always be that way.
-        /// This is because this method can use SIMD instructions if possible, which can cause a computed
-        /// hash to differ for the same data, if processed on different machines with different CPU features.
-        /// The advantage of this method is that when SIMD instructions are available, it performs much
-        /// faster than <see cref="GetDjb2HashCode{T}"/>, as it can parallelize much of the workload.
-        /// </remarks>
-        [Pure]
-        public static unsafe int GetDjb2LikeByteHash(ref byte r0, nint length)
-        {
-            int hash = 5381;
-            nint offset = 0;
-
-            // Check whether SIMD instructions are supported, and also check
-            // whether we have enough data to perform at least one unrolled
-            // iteration of the vectorized path. This heuristics is to balance
-            // the overhead of loading the constant values in the two registers,
-            // 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 hash codes to potentially be different for the same data.
-            if (Vector.IsHardwareAccelerated &&
-                length >= (Vector<byte>.Count << 3))
-            {
-                var vh = new Vector<int>(5381);
-                var v33 = new Vector<int>(33);
-
-                // First vectorized loop, with 8 unrolled iterations.
-                // Assuming 256-bit registers (AVX2), a total of 256 bytes are processed
-                // per iteration, with the partial hashes being accumulated for later use.
-                while (length >= (Vector<byte>.Count << 3))
-                {
-                    ref byte ri0 = ref Unsafe.Add(ref r0, offset + (Vector<byte>.Count * 0));
-                    var vi0 = Unsafe.ReadUnaligned<Vector<int>>(ref ri0);
-                    var vp0 = Vector.Multiply(vh, v33);
-                    vh = Vector.Xor(vp0, vi0);
-
-                    ref byte ri1 = ref Unsafe.Add(ref r0, offset + (Vector<byte>.Count * 1));
-                    var vi1 = Unsafe.ReadUnaligned<Vector<int>>(ref ri1);
-                    var vp1 = Vector.Multiply(vh, v33);
-                    vh = Vector.Xor(vp1, vi1);
-
-                    ref byte ri2 = ref Unsafe.Add(ref r0, offset + (Vector<byte>.Count * 2));
-                    var vi2 = Unsafe.ReadUnaligned<Vector<int>>(ref ri2);
-                    var vp2 = Vector.Multiply(vh, v33);
-                    vh = Vector.Xor(vp2, vi2);
-
-                    ref byte ri3 = ref Unsafe.Add(ref r0, offset + (Vector<byte>.Count * 3));
-                    var vi3 = Unsafe.ReadUnaligned<Vector<int>>(ref ri3);
-                    var vp3 = Vector.Multiply(vh, v33);
-                    vh = Vector.Xor(vp3, vi3);
-
-                    ref byte ri4 = ref Unsafe.Add(ref r0, offset + (Vector<byte>.Count * 4));
-                    var vi4 = Unsafe.ReadUnaligned<Vector<int>>(ref ri4);
-                    var vp4 = Vector.Multiply(vh, v33);
-                    vh = Vector.Xor(vp4, vi4);
-
-                    ref byte ri5 = ref Unsafe.Add(ref r0, offset + (Vector<byte>.Count * 5));
-                    var vi5 = Unsafe.ReadUnaligned<Vector<int>>(ref ri5);
-                    var vp5 = Vector.Multiply(vh, v33);
-                    vh = Vector.Xor(vp5, vi5);
-
-                    ref byte ri6 = ref Unsafe.Add(ref r0, offset + (Vector<byte>.Count * 6));
-                    var vi6 = Unsafe.ReadUnaligned<Vector<int>>(ref ri6);
-                    var vp6 = Vector.Multiply(vh, v33);
-                    vh = Vector.Xor(vp6, vi6);
-
-                    ref byte ri7 = ref Unsafe.Add(ref r0, offset + (Vector<byte>.Count * 7));
-                    var vi7 = Unsafe.ReadUnaligned<Vector<int>>(ref ri7);
-                    var vp7 = Vector.Multiply(vh, v33);
-                    vh = Vector.Xor(vp7, vi7);
-
-                    length -= Vector<byte>.Count << 3;
-                    offset += Vector<byte>.Count << 3;
-                }
-
-                // When this loop is reached, there are up to 255 bytes left (on AVX2).
-                // Each iteration processed an additional 32 bytes and accumulates the results.
-                while (length >= Vector<byte>.Count)
-                {
-                    ref byte ri = ref Unsafe.Add(ref r0, offset);
-                    var vi = Unsafe.ReadUnaligned<Vector<int>>(ref ri);
-                    var vp = Vector.Multiply(vh, v33);
-                    vh = Vector.Xor(vp, vi);
-
-                    length -= Vector<byte>.Count;
-                    offset += Vector<byte>.Count;
-                }
-
-                // Combine the partial hash values in each position.
-                // The loop below should automatically be unrolled by the JIT.
-                for (var j = 0; j < Vector<int>.Count; j++)
-                {
-                    hash = unchecked(((hash << 5) + hash) ^ vh[j]);
-                }
-            }
-            else
-            {
-                // Only use the loop working with 64-bit values if we are on a
-                // 64-bit processor, otherwise the result would be much slower.
-                // Each unrolled iteration processes 64 bytes.
-                if (sizeof(nint) == sizeof(ulong))
-                {
-                    while (length >= (sizeof(ulong) << 3))
-                    {
-                        ref byte ri0 = ref Unsafe.Add(ref r0, offset + (sizeof(ulong) * 0));
-                        var value0 = Unsafe.ReadUnaligned<ulong>(ref ri0);
-                        hash = unchecked(((hash << 5) + hash) ^ (int)value0 ^ (int)(value0 >> 32));
-
-                        ref byte ri1 = ref Unsafe.Add(ref r0, offset + (sizeof(ulong) * 1));
-                        var value1 = Unsafe.ReadUnaligned<ulong>(ref ri1);
-                        hash = unchecked(((hash << 5) + hash) ^ (int)value1 ^ (int)(value1 >> 32));
-
-                        ref byte ri2 = ref Unsafe.Add(ref r0, offset + (sizeof(ulong) * 2));
-                        var value2 = Unsafe.ReadUnaligned<ulong>(ref ri2);
-                        hash = unchecked(((hash << 5) + hash) ^ (int)value2 ^ (int)(value2 >> 32));
-
-                        ref byte ri3 = ref Unsafe.Add(ref r0, offset + (sizeof(ulong) * 3));
-                        var value3 = Unsafe.ReadUnaligned<ulong>(ref ri3);
-                        hash = unchecked(((hash << 5) + hash) ^ (int)value3 ^ (int)(value3 >> 32));
-
-                        ref byte ri4 = ref Unsafe.Add(ref r0, offset + (sizeof(ulong) * 4));
-                        var value4 = Unsafe.ReadUnaligned<ulong>(ref ri4);
-                        hash = unchecked(((hash << 5) + hash) ^ (int)value4 ^ (int)(value4 >> 32));
-
-                        ref byte ri5 = ref Unsafe.Add(ref r0, offset + (sizeof(ulong) * 5));
-                        var value5 = Unsafe.ReadUnaligned<ulong>(ref ri5);
-                        hash = unchecked(((hash << 5) + hash) ^ (int)value5 ^ (int)(value5 >> 32));
-
-                        ref byte ri6 = ref Unsafe.Add(ref r0, offset + (sizeof(ulong) * 6));
-                        var value6 = Unsafe.ReadUnaligned<ulong>(ref ri6);
-                        hash = unchecked(((hash << 5) + hash) ^ (int)value6 ^ (int)(value6 >> 32));
-
-                        ref byte ri7 = ref Unsafe.Add(ref r0, offset + (sizeof(ulong) * 7));
-                        var value7 = Unsafe.ReadUnaligned<ulong>(ref ri7);
-                        hash = unchecked(((hash << 5) + hash) ^ (int)value7 ^ (int)(value7 >> 32));
-
-                        length -= sizeof(ulong) << 3;
-                        offset += sizeof(ulong) << 3;
-                    }
-                }
-
-                // Each unrolled iteration processes 32 bytes
-                while (length >= (sizeof(uint) << 3))
-                {
-                    ref byte ri0 = ref Unsafe.Add(ref r0, offset + (sizeof(uint) * 0));
-                    var value0 = Unsafe.ReadUnaligned<uint>(ref ri0);
-                    hash = unchecked(((hash << 5) + hash) ^ (int)value0);
-
-                    ref byte ri1 = ref Unsafe.Add(ref r0, offset + (sizeof(uint) * 1));
-                    var value1 = Unsafe.ReadUnaligned<uint>(ref ri1);
-                    hash = unchecked(((hash << 5) + hash) ^ (int)value1);
-
-                    ref byte ri2 = ref Unsafe.Add(ref r0, offset + (sizeof(uint) * 2));
-                    var value2 = Unsafe.ReadUnaligned<uint>(ref ri2);
-                    hash = unchecked(((hash << 5) + hash) ^ (int)value2);
-
-                    ref byte ri3 = ref Unsafe.Add(ref r0, offset + (sizeof(uint) * 3));
-                    var value3 = Unsafe.ReadUnaligned<uint>(ref ri3);
-                    hash = unchecked(((hash << 5) + hash) ^ (int)value3);
-
-                    ref byte ri4 = ref Unsafe.Add(ref r0, offset + (sizeof(uint) * 4));
-                    var value4 = Unsafe.ReadUnaligned<uint>(ref ri4);
-                    hash = unchecked(((hash << 5) + hash) ^ (int)value4);
-
-                    ref byte ri5 = ref Unsafe.Add(ref r0, offset + (sizeof(uint) * 5));
-                    var value5 = Unsafe.ReadUnaligned<uint>(ref ri5);
-                    hash = unchecked(((hash << 5) + hash) ^ (int)value5);
-
-                    ref byte ri6 = ref Unsafe.Add(ref r0, offset + (sizeof(uint) * 6));
-                    var value6 = Unsafe.ReadUnaligned<uint>(ref ri6);
-                    hash = unchecked(((hash << 5) + hash) ^ (int)value6);
-
-                    ref byte ri7 = ref Unsafe.Add(ref r0, offset + (sizeof(uint) * 7));
-                    var value7 = Unsafe.ReadUnaligned<uint>(ref ri7);
-                    hash = unchecked(((hash << 5) + hash) ^ (int)value7);
-
-                    length -= sizeof(uint) << 3;
-                    offset += sizeof(uint) << 3;
-                }
-            }
-
-            // At this point (assuming AVX2), there will be up to 31 bytes
-            // left, both for the vectorized and non vectorized paths.
-            // That number would go up to 63 on AVX512 systems, in which case it is
-            // still useful to perform this last loop unrolling.
-            if (length >= (sizeof(ushort) << 3))
-            {
-                ref byte ri0 = ref Unsafe.Add(ref r0, offset + (sizeof(ushort) * 0));
-                var value0 = Unsafe.ReadUnaligned<ushort>(ref ri0);
-                hash = unchecked(((hash << 5) + hash) ^ value0);
-
-                ref byte ri1 = ref Unsafe.Add(ref r0, offset + (sizeof(ushort) * 1));
-                var value1 = Unsafe.ReadUnaligned<ushort>(ref ri1);
-                hash = unchecked(((hash << 5) + hash) ^ value1);
-
-                ref byte ri2 = ref Unsafe.Add(ref r0, offset + (sizeof(ushort) * 2));
-                var value2 = Unsafe.ReadUnaligned<ushort>(ref ri2);
-                hash = unchecked(((hash << 5) + hash) ^ value2);
-
-                ref byte ri3 = ref Unsafe.Add(ref r0, offset + (sizeof(ushort) * 3));
-                var value3 = Unsafe.ReadUnaligned<ushort>(ref ri3);
-                hash = unchecked(((hash << 5) + hash) ^ value3);
-
-                ref byte ri4 = ref Unsafe.Add(ref r0, offset + (sizeof(ushort) * 4));
-                var value4 = Unsafe.ReadUnaligned<ushort>(ref ri4);
-                hash = unchecked(((hash << 5) + hash) ^ value4);
-
-                ref byte ri5 = ref Unsafe.Add(ref r0, offset + (sizeof(ushort) * 5));
-                var value5 = Unsafe.ReadUnaligned<ushort>(ref ri5);
-                hash = unchecked(((hash << 5) + hash) ^ value5);
-
-                ref byte ri6 = ref Unsafe.Add(ref r0, offset + (sizeof(ushort) * 6));
-                var value6 = Unsafe.ReadUnaligned<ushort>(ref ri6);
-                hash = unchecked(((hash << 5) + hash) ^ value6);
-
-                ref byte ri7 = ref Unsafe.Add(ref r0, offset + (sizeof(ushort) * 7));
-                var value7 = Unsafe.ReadUnaligned<ushort>(ref ri7);
-                hash = unchecked(((hash << 5) + hash) ^ value7);
-
-                length -= sizeof(ushort) << 3;
-                offset += sizeof(ushort) << 3;
-            }
-
-            // Handle the leftover items
-            while (length > 0)
-            {
-                hash = unchecked(((hash << 5) + hash) ^ Unsafe.Add(ref r0, offset));
-
-                length -= 1;
-                offset += 1;
-            }
-
-            return hash;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ObjectMarshal.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ObjectMarshal.cs
deleted file mode 100644
index 9c77a007948..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/ObjectMarshal.cs
+++ /dev/null
@@ -1,148 +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;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers
-{
-    /// <summary>
-    /// Helpers for working with <see cref="object"/> instances.
-    /// </summary>
-    public static class ObjectMarshal
-    {
-        /// <summary>
-        /// Calculates the byte offset to a specific field within a given <see cref="object"/>.
-        /// </summary>
-        /// <typeparam name="T">The type of field being referenced.</typeparam>
-        /// <param name="obj">The input <see cref="object"/> hosting the target field.</param>
-        /// <param name="data">A reference to a target field of type <typeparamref name="T"/> within <paramref name="obj"/>.</param>
-        /// <returns>
-        /// 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 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]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static IntPtr DangerousGetObjectDataByteOffset<T>(object obj, ref T data)
-        {
-            var rawObj = Unsafe.As<RawObjectData>(obj)!;
-            ref byte r0 = ref rawObj.Data;
-            ref byte r1 = ref Unsafe.As<T, byte>(ref data);
-
-            return Unsafe.ByteOffset(ref r0, ref r1);
-        }
-
-        /// <summary>
-        /// Gets a <typeparamref name="T"/> reference to data within a given <see cref="object"/> at a specified offset.
-        /// </summary>
-        /// <typeparam name="T">The type of reference to retrieve.</typeparam>
-        /// <param name="obj">The input <see cref="object"/> hosting the target field.</param>
-        /// <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 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.
-        /// </remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T DangerousGetObjectDataReferenceAt<T>(object obj, IntPtr offset)
-        {
-            var rawObj = Unsafe.As<RawObjectData>(obj)!;
-            ref byte r0 = ref rawObj.Data;
-            ref byte r1 = ref Unsafe.AddByteOffset(ref r0, offset);
-            ref T r2 = ref Unsafe.As<byte, T>(ref r1);
-
-            return ref r2;
-        }
-
-        // Description adapted from CoreCLR, see:
-        // https://source.dot.net/#System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.CoreCLR.cs,301.
-        // CLR objects are laid out in memory as follows:
-        // [ sync block || pMethodTable || raw data .. ]
-        //                 ^               ^
-        //                 |               \-- ref Unsafe.As<RawObjectData>(owner).Data
-        //                 \-- object
-        // The reference to RawObjectData.Data points to the first data byte in the
-        // target object, skipping over the sync block, method table and string length.
-        // Even though the description above links to the CoreCLR source, this approach
-        // can actually work on any .NET runtime, as it doesn't rely on a specific memory
-        // layout. Even if some 3rd party .NET runtime had some additional fields in the
-        // object header, before the field being referenced, the returned offset would still
-        // be valid when used on instances of that particular type, as it's only being
-        // used as a relative offset from the location pointed by the object reference.
-        [StructLayout(LayoutKind.Explicit)]
-        private sealed class RawObjectData
-        {
-            [FieldOffset(0)]
-#pragma warning disable SA1401 // Fields should be private
-            public byte Data;
-#pragma warning restore SA1401
-        }
-
-        /// <summary>
-        /// Tries to get a boxed <typeparamref name="T"/> value from an input <see cref="object"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of value to try to unbox.</typeparam>
-        /// <param name="obj">The input <see cref="object"/> instance to check.</param>
-        /// <param name="value">The resulting <typeparamref name="T"/> value, if <paramref name="obj"/> was in fact a boxed <typeparamref name="T"/> value.</param>
-        /// <returns><see langword="true"/> if a <typeparamref name="T"/> value was retrieved correctly, <see langword="false"/> otherwise.</returns>
-        /// <remarks>
-        /// This extension behaves just like the following method:
-        /// <code>
-        /// public static bool TryUnbox&lt;T>(object obj, out T value)
-        /// {
-        ///     if (obj is T)
-        ///     {
-        ///         value = (T)obj;
-        ///
-        ///         return true;
-        ///     }
-        ///
-        ///     value = default;
-        ///
-        ///     return false;
-        /// }
-        /// </code>
-        /// But in a more efficient way, and with the ability to also assign the unboxed value
-        /// directly on an existing T variable, which is not possible with the code above.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool TryUnbox<T>(this object obj, out T value)
-            where T : struct
-        {
-            if (obj.GetType() == typeof(T))
-            {
-                value = Unsafe.Unbox<T>(obj);
-
-                return true;
-            }
-
-            value = default;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Unboxes a <typeparamref name="T"/> value from an input <see cref="object"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of value to unbox.</typeparam>
-        /// <param name="obj">The input <see cref="object"/> instance, representing a boxed <typeparamref name="T"/> value.</param>
-        /// <returns>The <typeparamref name="T"/> value boxed in <paramref name="obj"/>.</returns>
-        /// <exception cref="InvalidCastException">Thrown when <paramref name="obj"/> is not of type <typeparamref name="T"/>.</exception>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ref T DangerousUnbox<T>(object obj)
-            where T : struct
-        {
-            return ref Unsafe.Unbox<T>(obj);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.For.IAction.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.For.IAction.cs
deleted file mode 100644
index 676a2b39dbd..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.For.IAction.cs
+++ /dev/null
@@ -1,249 +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 System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers
-{
-    /// <summary>
-    /// Helpers to work with parallel code in a highly optimized manner.
-    /// </summary>
-    public static partial class ParallelHelper
-    {
-#if NETSTANDARD2_1_OR_GREATER
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction"/>) to invoke for each iteration index.</typeparam>
-        /// <param name="range">The iteration range.</param>
-        /// <remarks>None of the bounds of <paramref name="range"/> can start from an end.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For<TAction>(Range range)
-            where TAction : struct, IAction
-        {
-            For(range, default(TAction), 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction"/>) to invoke for each iteration index.</typeparam>
-        /// <param name="range">The iteration range.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        /// <remarks>None of the bounds of <paramref name="range"/> can start from an end.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For<TAction>(Range range, int minimumActionsPerThread)
-            where TAction : struct, IAction
-        {
-            For(range, default(TAction), minimumActionsPerThread);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction"/>) to invoke for each iteration index.</typeparam>
-        /// <param name="range">The iteration range.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        /// <remarks>None of the bounds of <paramref name="range"/> can start from an end.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For<TAction>(Range range, in TAction action)
-            where TAction : struct, IAction
-        {
-            For(range, action, 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction"/>) to invoke for each iteration index.</typeparam>
-        /// <param name="range">The iteration range.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        /// <remarks>None of the bounds of <paramref name="range"/> can start from an end.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For<TAction>(Range range, in TAction action, int minimumActionsPerThread)
-            where TAction : struct, IAction
-        {
-            if (range.Start.IsFromEnd || range.End.IsFromEnd)
-            {
-                ThrowArgumentExceptionForRangeIndexFromEnd(nameof(range));
-            }
-
-            int
-                start = range.Start.Value,
-                end = range.End.Value;
-
-            For(start, end, action, minimumActionsPerThread);
-        }
-#endif
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction"/>) to invoke for each iteration index.</typeparam>
-        /// <param name="start">The starting iteration index.</param>
-        /// <param name="end">The final iteration index (exclusive).</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For<TAction>(int start, int end)
-            where TAction : struct, IAction
-        {
-            For(start, end, default(TAction), 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction"/>) to invoke for each iteration index.</typeparam>
-        /// <param name="start">The starting iteration index.</param>
-        /// <param name="end">The final iteration index (exclusive).</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For<TAction>(int start, int end, int minimumActionsPerThread)
-            where TAction : struct, IAction
-        {
-            For(start, end, default(TAction), minimumActionsPerThread);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction"/>) to invoke for each iteration index.</typeparam>
-        /// <param name="start">The starting iteration index.</param>
-        /// <param name="end">The final iteration index (exclusive).</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For<TAction>(int start, int end, in TAction action)
-            where TAction : struct, IAction
-        {
-            For(start, end, action, 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction"/>) to invoke for each iteration index.</typeparam>
-        /// <param name="start">The starting iteration index.</param>
-        /// <param name="end">The final iteration index (exclusive).</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        public static void For<TAction>(int start, int end, in TAction action, int minimumActionsPerThread)
-            where TAction : struct, IAction
-        {
-            if (minimumActionsPerThread <= 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForInvalidMinimumActionsPerThread();
-            }
-
-            if (start > end)
-            {
-                ThrowArgumentOutOfRangeExceptionForStartGreaterThanEnd();
-            }
-
-            if (start == end)
-            {
-                return;
-            }
-
-            int
-                count = Math.Abs(start - end),
-                maxBatches = 1 + ((count - 1) / minimumActionsPerThread),
-                cores = Environment.ProcessorCount,
-                numBatches = Math.Min(maxBatches, cores);
-
-            // Skip the parallel invocation when a single batch is needed
-            if (numBatches == 1)
-            {
-                for (int i = start; i < end; i++)
-                {
-                    Unsafe.AsRef(action).Invoke(i);
-                }
-
-                return;
-            }
-
-            int batchSize = 1 + ((count - 1) / numBatches);
-
-            var actionInvoker = new ActionInvoker<TAction>(start, end, batchSize, action);
-
-            // Run the batched operations in parallel
-            Parallel.For(
-                0,
-                numBatches,
-                new ParallelOptions { MaxDegreeOfParallelism = numBatches },
-                actionInvoker.Invoke);
-        }
-
-        // Wrapping struct acting as explicit closure to execute the processing batches
-        private readonly struct ActionInvoker<TAction>
-            where TAction : struct, IAction
-        {
-            private readonly int start;
-            private readonly int end;
-            private readonly int batchSize;
-            private readonly TAction action;
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public ActionInvoker(
-                int start,
-                int end,
-                int batchSize,
-                in TAction action)
-            {
-                this.start = start;
-                this.end = end;
-                this.batchSize = batchSize;
-                this.action = action;
-            }
-
-            /// <summary>
-            /// Processes the batch of actions at a specified index
-            /// </summary>
-            /// <param name="i">The index of the batch to process</param>
-            public void Invoke(int i)
-            {
-                int
-                    offset = i * this.batchSize,
-                    low = this.start + offset,
-                    high = low + this.batchSize,
-                    stop = Math.Min(high, this.end);
-
-                for (int j = low; j < stop; j++)
-                {
-                    Unsafe.AsRef(this.action).Invoke(j);
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    /// A contract for actions being executed with an input index.
-    /// </summary>
-    /// <remarks>If the <see cref="Invoke"/> method is small enough, it is highly recommended to mark it with <see cref="MethodImplOptions.AggressiveInlining"/>.</remarks>
-    public interface IAction
-    {
-        /// <summary>
-        /// Executes the action associated with a specific index.
-        /// </summary>
-        /// <param name="i">The current index for the action to execute.</param>
-        void Invoke(int i);
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.For.IAction2D.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.For.IAction2D.cs
deleted file mode 100644
index ae776f1566d..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.For.IAction2D.cs
+++ /dev/null
@@ -1,347 +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.Drawing;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers
-{
-    /// <summary>
-    /// Helpers to work with parallel code in a highly optimized manner.
-    /// </summary>
-    public static partial class ParallelHelper
-    {
-#if NETSTANDARD2_1_OR_GREATER
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction2D"/>) to invoke for each pair of iteration indices.</typeparam>
-        /// <param name="i">The <see cref="Range"/> value indicating the iteration range for the outer loop.</param>
-        /// <param name="j">The <see cref="Range"/> value indicating the iteration range for the inner loop.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For2D<TAction>(Range i, Range j)
-            where TAction : struct, IAction2D
-        {
-            For2D(i, j, default(TAction), 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction2D"/>) to invoke for each pair of iteration indices.</typeparam>
-        /// <param name="i">The <see cref="Range"/> value indicating the iteration range for the outer loop.</param>
-        /// <param name="j">The <see cref="Range"/> value indicating the iteration range for the inner loop.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For2D<TAction>(Range i, Range j, int minimumActionsPerThread)
-            where TAction : struct, IAction2D
-        {
-            For2D(i, j, default(TAction), minimumActionsPerThread);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction2D"/>) to invoke for each pair of iteration indices.</typeparam>
-        /// <param name="i">The <see cref="Range"/> value indicating the iteration range for the outer loop.</param>
-        /// <param name="j">The <see cref="Range"/> value indicating the iteration range for the inner loop.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For2D<TAction>(Range i, Range j, in TAction action)
-            where TAction : struct, IAction2D
-        {
-            For2D(i, j, action, 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction2D"/>) to invoke for each pair of iteration indices.</typeparam>
-        /// <param name="i">The <see cref="Range"/> value indicating the iteration range for the outer loop.</param>
-        /// <param name="j">The <see cref="Range"/> value indicating the iteration range for the inner loop.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For2D<TAction>(Range i, Range j, in TAction action, int minimumActionsPerThread)
-            where TAction : struct, IAction2D
-        {
-            if (i.Start.IsFromEnd || i.End.IsFromEnd)
-            {
-                ThrowArgumentExceptionForRangeIndexFromEnd(nameof(i));
-            }
-
-            if (j.Start.IsFromEnd || j.End.IsFromEnd)
-            {
-                ThrowArgumentExceptionForRangeIndexFromEnd(nameof(j));
-            }
-
-            int
-                top = i.Start.Value,
-                bottom = i.End.Value,
-                left = j.Start.Value,
-                right = j.End.Value;
-
-            For2D(top, bottom, left, right, action, minimumActionsPerThread);
-        }
-#endif
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction2D"/>) to invoke for each pair of iteration indices.</typeparam>
-        /// <param name="area">The <see cref="Rectangle"/> value indicating the 2D iteration area to use.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For2D<TAction>(Rectangle area)
-            where TAction : struct, IAction2D
-        {
-            For2D(area.Top, area.Bottom, area.Left, area.Right, default(TAction), 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction2D"/>) to invoke for each pair of iteration indices.</typeparam>
-        /// <param name="area">The <see cref="Rectangle"/> value indicating the 2D iteration area to use.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For2D<TAction>(Rectangle area, int minimumActionsPerThread)
-            where TAction : struct, IAction2D
-        {
-            For2D(area.Top, area.Bottom, area.Left, area.Right, default(TAction), minimumActionsPerThread);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction2D"/>) to invoke for each pair of iteration indices.</typeparam>
-        /// <param name="area">The <see cref="Rectangle"/> value indicating the 2D iteration area to use.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For2D<TAction>(Rectangle area, in TAction action)
-            where TAction : struct, IAction2D
-        {
-            For2D(area.Top, area.Bottom, area.Left, area.Right, action, 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction2D"/>) to invoke for each pair of iteration indices.</typeparam>
-        /// <param name="area">The <see cref="Rectangle"/> value indicating the 2D iteration area to use.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For2D<TAction>(Rectangle area, in TAction action, int minimumActionsPerThread)
-            where TAction : struct, IAction2D
-        {
-            For2D(area.Top, area.Bottom, area.Left, area.Right, action, minimumActionsPerThread);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction2D"/>) to invoke for each pair of iteration indices.</typeparam>
-        /// <param name="top">The starting iteration value for the outer loop.</param>
-        /// <param name="bottom">The final iteration value for the outer loop (exclusive).</param>
-        /// <param name="left">The starting iteration value for the inner loop.</param>
-        /// <param name="right">The final iteration value for the inner loop (exclusive).</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For2D<TAction>(int top, int bottom, int left, int right)
-            where TAction : struct, IAction2D
-        {
-            For2D(top, bottom, left, right, default(TAction), 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction2D"/>) to invoke for each pair of iteration indices.</typeparam>
-        /// <param name="top">The starting iteration value for the outer loop.</param>
-        /// <param name="bottom">The final iteration value for the outer loop (exclusive).</param>
-        /// <param name="left">The starting iteration value for the inner loop.</param>
-        /// <param name="right">The final iteration value for the inner loop (exclusive).</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For2D<TAction>(int top, int bottom, int left, int right, int minimumActionsPerThread)
-            where TAction : struct, IAction2D
-        {
-            For2D(top, bottom, left, right, default(TAction), minimumActionsPerThread);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction2D"/>) to invoke for each pair of iteration indices.</typeparam>
-        /// <param name="top">The starting iteration value for the outer loop.</param>
-        /// <param name="bottom">The final iteration value for the outer loop (exclusive).</param>
-        /// <param name="left">The starting iteration value for the inner loop.</param>
-        /// <param name="right">The final iteration value for the inner loop (exclusive).</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void For2D<TAction>(int top, int bottom, int left, int right, in TAction action)
-            where TAction : struct, IAction2D
-        {
-            For2D(top, bottom, left, right, action, 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop.
-        /// </summary>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IAction2D"/>) to invoke for each pair of iteration indices.</typeparam>
-        /// <param name="top">The starting iteration value for the outer loop.</param>
-        /// <param name="bottom">The final iteration value for the outer loop (exclusive).</param>
-        /// <param name="left">The starting iteration value for the inner loop.</param>
-        /// <param name="right">The final iteration value for the inner loop (exclusive).</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        public static void For2D<TAction>(int top, int bottom, int left, int right, in TAction action, int minimumActionsPerThread)
-            where TAction : struct, IAction2D
-        {
-            if (minimumActionsPerThread <= 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForInvalidMinimumActionsPerThread();
-            }
-
-            if (top > bottom)
-            {
-                ThrowArgumentOutOfRangeExceptionForTopGreaterThanBottom();
-            }
-
-            if (left > right)
-            {
-                ThrowArgumentOutOfRangeExceptionForLeftGreaterThanRight();
-            }
-
-            // If either side of the target area is empty, no iterations are performed
-            if (top == bottom || left == right)
-            {
-                return;
-            }
-
-            int
-                height = Math.Abs(top - bottom),
-                width = Math.Abs(left - right),
-                count = height * width,
-                maxBatches = 1 + ((count - 1) / minimumActionsPerThread),
-                clipBatches = Math.Min(maxBatches, height),
-                cores = Environment.ProcessorCount,
-                numBatches = Math.Min(clipBatches, cores);
-
-            // Skip the parallel invocation when a single batch is needed
-            if (numBatches == 1)
-            {
-                for (int y = top; y < bottom; y++)
-                {
-                    for (int x = left; x < right; x++)
-                    {
-                        Unsafe.AsRef(action).Invoke(y, x);
-                    }
-                }
-
-                return;
-            }
-
-            int batchHeight = 1 + ((height - 1) / numBatches);
-
-            var actionInvoker = new Action2DInvoker<TAction>(top, bottom, left, right, batchHeight, action);
-
-            // Run the batched operations in parallel
-            Parallel.For(
-                0,
-                numBatches,
-                new ParallelOptions { MaxDegreeOfParallelism = numBatches },
-                actionInvoker.Invoke);
-        }
-
-        // Wrapping struct acting as explicit closure to execute the processing batches
-        private readonly struct Action2DInvoker<TAction>
-            where TAction : struct, IAction2D
-        {
-            private readonly int startY;
-            private readonly int endY;
-            private readonly int startX;
-            private readonly int endX;
-            private readonly int batchHeight;
-            private readonly TAction action;
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Action2DInvoker(
-                int startY,
-                int endY,
-                int startX,
-                int endX,
-                int batchHeight,
-                in TAction action)
-            {
-                this.startY = startY;
-                this.endY = endY;
-                this.startX = startX;
-                this.endX = endX;
-                this.batchHeight = batchHeight;
-                this.action = action;
-            }
-
-            /// <summary>
-            /// Processes the batch of actions at a specified index
-            /// </summary>
-            /// <param name="i">The index of the batch to process</param>
-            public void Invoke(int i)
-            {
-                int
-                    heightOffset = i * this.batchHeight,
-                    lowY = this.startY + heightOffset,
-                    highY = lowY + this.batchHeight,
-                    stopY = Math.Min(highY, this.endY);
-
-                for (int y = lowY; y < stopY; y++)
-                {
-                    for (int x = this.startX; x < this.endX; x++)
-                    {
-                        Unsafe.AsRef(this.action).Invoke(y, x);
-                    }
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    /// A contract for actions being executed with two input indices.
-    /// </summary>
-    /// <remarks>If the <see cref="Invoke"/> method is small enough, it is highly recommended to mark it with <see cref="MethodImplOptions.AggressiveInlining"/>.</remarks>
-    public interface IAction2D
-    {
-        /// <summary>
-        /// Executes the action associated with two specified indices.
-        /// </summary>
-        /// <param name="i">The first index for the action to execute.</param>
-        /// <param name="j">The second index for the action to execute.</param>
-        void Invoke(int i, int j);
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction.cs
deleted file mode 100644
index 224d1961e43..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction.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 System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers
-{
-    /// <summary>
-    /// Helpers to work with parallel code in a highly optimized manner.
-    /// </summary>
-    public static partial class ParallelHelper
-    {
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IInAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> representing the data to process.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ForEach<TItem, TAction>(ReadOnlyMemory<TItem> memory)
-            where TAction : struct, IInAction<TItem>
-        {
-            ForEach(memory, default(TAction), 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IInAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> representing the data to process.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ForEach<TItem, TAction>(ReadOnlyMemory<TItem> memory, int minimumActionsPerThread)
-            where TAction : struct, IInAction<TItem>
-        {
-            ForEach(memory, default(TAction), minimumActionsPerThread);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IInAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> representing the data to process.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ForEach<TItem, TAction>(ReadOnlyMemory<TItem> memory, in TAction action)
-            where TAction : struct, IInAction<TItem>
-        {
-            ForEach(memory, action, 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IInAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory{T}"/> representing the data to process.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        public static void ForEach<TItem, TAction>(ReadOnlyMemory<TItem> memory, in TAction action, int minimumActionsPerThread)
-            where TAction : struct, IInAction<TItem>
-        {
-            if (minimumActionsPerThread <= 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForInvalidMinimumActionsPerThread();
-            }
-
-            if (memory.IsEmpty)
-            {
-                return;
-            }
-
-            int
-                maxBatches = 1 + ((memory.Length - 1) / minimumActionsPerThread),
-                cores = Environment.ProcessorCount,
-                numBatches = Math.Min(maxBatches, cores);
-
-            // Skip the parallel invocation when a single batch is needed
-            if (numBatches == 1)
-            {
-                foreach (var item in memory.Span)
-                {
-                    Unsafe.AsRef(action).Invoke(item);
-                }
-
-                return;
-            }
-
-            int batchSize = 1 + ((memory.Length - 1) / numBatches);
-
-            var actionInvoker = new InActionInvoker<TItem, TAction>(batchSize, memory, action);
-
-            // Run the batched operations in parallel
-            Parallel.For(
-                0,
-                numBatches,
-                new ParallelOptions { MaxDegreeOfParallelism = numBatches },
-                actionInvoker.Invoke);
-        }
-
-        // Wrapping struct acting as explicit closure to execute the processing batches
-        private readonly struct InActionInvoker<TItem, TAction>
-            where TAction : struct, IInAction<TItem>
-        {
-            private readonly int batchSize;
-            private readonly ReadOnlyMemory<TItem> memory;
-            private readonly TAction action;
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public InActionInvoker(
-                int batchSize,
-                ReadOnlyMemory<TItem> memory,
-                in TAction action)
-            {
-                this.batchSize = batchSize;
-                this.memory = memory;
-                this.action = action;
-            }
-
-            /// <summary>
-            /// Processes the batch of actions at a specified index
-            /// </summary>
-            /// <param name="i">The index of the batch to process</param>
-            public void Invoke(int i)
-            {
-                int
-                    low = i * this.batchSize,
-                    high = low + this.batchSize,
-                    end = Math.Min(high, this.memory.Length);
-
-                ref TItem r0 = ref MemoryMarshal.GetReference(this.memory.Span);
-                ref TItem rStart = ref Unsafe.Add(ref r0, low);
-                ref TItem rEnd = ref Unsafe.Add(ref r0, end);
-
-                while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
-                {
-                    Unsafe.AsRef(this.action).Invoke(in rStart);
-
-                    rStart = ref Unsafe.Add(ref rStart, 1);
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    /// A contract for actions being executed on items of a specific type, with readonly access.
-    /// </summary>
-    /// <typeparam name="T">The type of items to process.</typeparam>
-    /// <remarks>If the <see cref="Invoke"/> method is small enough, it is highly recommended to mark it with <see cref="MethodImplOptions.AggressiveInlining"/>.</remarks>
-    public interface IInAction<T>
-    {
-        /// <summary>
-        /// Executes the action on a specified <typeparamref name="T"/> item.
-        /// </summary>
-        /// <param name="item">The current item to process.</param>
-        void Invoke(in T item);
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction2D.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction2D.cs
deleted file mode 100644
index cce703b2d74..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction2D.cs
+++ /dev/null
@@ -1,160 +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 System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers
-{
-    /// <summary>
-    /// Helpers to work with parallel code in a highly optimized manner.
-    /// </summary>
-    public static partial class ParallelHelper
-    {
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IInAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory2D{T}"/> representing the data to process.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ForEach<TItem, TAction>(ReadOnlyMemory2D<TItem> memory)
-            where TAction : struct, IInAction<TItem>
-        {
-            ForEach(memory, default(TAction), 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IInAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory2D{T}"/> representing the data to process.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ForEach<TItem, TAction>(ReadOnlyMemory2D<TItem> memory, int minimumActionsPerThread)
-            where TAction : struct, IInAction<TItem>
-        {
-            ForEach(memory, default(TAction), minimumActionsPerThread);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IInAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory2D{T}"/> representing the data to process.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ForEach<TItem, TAction>(ReadOnlyMemory2D<TItem> memory, in TAction action)
-            where TAction : struct, IInAction<TItem>
-        {
-            ForEach(memory, action, 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IInAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory2D{T}"/> representing the data to process.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        public static void ForEach<TItem, TAction>(ReadOnlyMemory2D<TItem> memory, in TAction action, int minimumActionsPerThread)
-            where TAction : struct, IInAction<TItem>
-        {
-            if (minimumActionsPerThread <= 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForInvalidMinimumActionsPerThread();
-            }
-
-            if (memory.IsEmpty)
-            {
-                return;
-            }
-
-            nint
-                maxBatches = 1 + ((memory.Length - 1) / minimumActionsPerThread),
-                clipBatches = maxBatches <= memory.Height ? maxBatches : memory.Height;
-            int
-                cores = Environment.ProcessorCount,
-                numBatches = (int)(clipBatches <= cores ? clipBatches : cores),
-                batchHeight = 1 + ((memory.Height - 1) / numBatches);
-
-            var actionInvoker = new InActionInvokerWithReadOnlyMemory2D<TItem, TAction>(batchHeight, memory, action);
-
-            // Skip the parallel invocation when possible
-            if (numBatches == 1)
-            {
-                actionInvoker.Invoke(0);
-
-                return;
-            }
-
-            // Run the batched operations in parallel
-            Parallel.For(
-                0,
-                numBatches,
-                new ParallelOptions { MaxDegreeOfParallelism = numBatches },
-                actionInvoker.Invoke);
-        }
-
-        // Wrapping struct acting as explicit closure to execute the processing batches
-        private readonly struct InActionInvokerWithReadOnlyMemory2D<TItem, TAction>
-            where TAction : struct, IInAction<TItem>
-        {
-            private readonly int batchHeight;
-            private readonly ReadOnlyMemory2D<TItem> memory;
-            private readonly TAction action;
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public InActionInvokerWithReadOnlyMemory2D(
-                int batchHeight,
-                ReadOnlyMemory2D<TItem> memory,
-                in TAction action)
-            {
-                this.batchHeight = batchHeight;
-                this.memory = memory;
-                this.action = action;
-            }
-
-            /// <summary>
-            /// Processes the batch of actions at a specified index
-            /// </summary>
-            /// <param name="i">The index of the batch to process</param>
-            public void Invoke(int i)
-            {
-                int lowY = i * this.batchHeight;
-                nint highY = lowY + this.batchHeight;
-                int
-                    stopY = (int)(highY <= this.memory.Height ? highY : this.memory.Height),
-                    width = this.memory.Width;
-
-                ReadOnlySpan2D<TItem> span = this.memory.Span;
-
-                for (int y = lowY; y < stopY; y++)
-                {
-                    ref TItem rStart = ref span.DangerousGetReferenceAt(y, 0);
-                    ref TItem rEnd = ref Unsafe.Add(ref rStart, width);
-
-                    while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
-                    {
-                        Unsafe.AsRef(this.action).Invoke(in rStart);
-
-                        rStart = ref Unsafe.Add(ref rStart, 1);
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction.cs
deleted file mode 100644
index c88f8874d06..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction.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 System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers
-{
-    /// <summary>
-    /// Helpers to work with parallel code in a highly optimized manner.
-    /// </summary>
-    public static partial class ParallelHelper
-    {
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IRefAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> representing the data to process.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ForEach<TItem, TAction>(Memory<TItem> memory)
-            where TAction : struct, IRefAction<TItem>
-        {
-            ForEach(memory, default(TAction), 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IInAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> representing the data to process.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ForEach<TItem, TAction>(Memory<TItem> memory, int minimumActionsPerThread)
-            where TAction : struct, IRefAction<TItem>
-        {
-            ForEach(memory, default(TAction), minimumActionsPerThread);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IInAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> representing the data to process.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ForEach<TItem, TAction>(Memory<TItem> memory, in TAction action)
-            where TAction : struct, IRefAction<TItem>
-        {
-            ForEach(memory, action, 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IInAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="Memory{T}"/> representing the data to process.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        public static void ForEach<TItem, TAction>(Memory<TItem> memory, in TAction action, int minimumActionsPerThread)
-            where TAction : struct, IRefAction<TItem>
-        {
-            if (minimumActionsPerThread <= 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForInvalidMinimumActionsPerThread();
-            }
-
-            if (memory.IsEmpty)
-            {
-                return;
-            }
-
-            int
-                maxBatches = 1 + ((memory.Length - 1) / minimumActionsPerThread),
-                cores = Environment.ProcessorCount,
-                numBatches = Math.Min(maxBatches, cores);
-
-            // Skip the parallel invocation when a single batch is needed
-            if (numBatches == 1)
-            {
-                foreach (ref var item in memory.Span)
-                {
-                    Unsafe.AsRef(action).Invoke(ref item);
-                }
-
-                return;
-            }
-
-            int batchSize = 1 + ((memory.Length - 1) / numBatches);
-
-            var actionInvoker = new RefActionInvoker<TItem, TAction>(batchSize, memory, action);
-
-            // Run the batched operations in parallel
-            Parallel.For(
-                0,
-                numBatches,
-                new ParallelOptions { MaxDegreeOfParallelism = numBatches },
-                actionInvoker.Invoke);
-        }
-
-        // Wrapping struct acting as explicit closure to execute the processing batches
-        private readonly struct RefActionInvoker<TItem, TAction>
-            where TAction : struct, IRefAction<TItem>
-        {
-            private readonly int batchSize;
-            private readonly ReadOnlyMemory<TItem> memory;
-            private readonly TAction action;
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public RefActionInvoker(
-                int batchSize,
-                ReadOnlyMemory<TItem> memory,
-                in TAction action)
-            {
-                this.batchSize = batchSize;
-                this.memory = memory;
-                this.action = action;
-            }
-
-            /// <summary>
-            /// Processes the batch of actions at a specified index
-            /// </summary>
-            /// <param name="i">The index of the batch to process</param>
-            public void Invoke(int i)
-            {
-                int
-                    low = i * this.batchSize,
-                    high = low + this.batchSize,
-                    end = Math.Min(high, this.memory.Length);
-
-                ref TItem r0 = ref MemoryMarshal.GetReference(this.memory.Span);
-                ref TItem rStart = ref Unsafe.Add(ref r0, low);
-                ref TItem rEnd = ref Unsafe.Add(ref r0, end);
-
-                while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
-                {
-                    Unsafe.AsRef(this.action).Invoke(ref rStart);
-
-                    rStart = ref Unsafe.Add(ref rStart, 1);
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    /// A contract for actions being executed on items of a specific type, with side effect.
-    /// </summary>
-    /// <typeparam name="T">The type of items to process.</typeparam>
-    /// <remarks>If the <see cref="Invoke"/> method is small enough, it is highly recommended to mark it with <see cref="MethodImplOptions.AggressiveInlining"/>.</remarks>
-    public interface IRefAction<T>
-    {
-        /// <summary>
-        /// Executes the action on a specified <typeparamref name="T"/> item.
-        /// </summary>
-        /// <param name="item">The current item to process.</param>
-        void Invoke(ref T item);
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction2D.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction2D.cs
deleted file mode 100644
index 0d7f9b2ff34..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction2D.cs
+++ /dev/null
@@ -1,167 +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 System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.HighPerformance.Helpers
-{
-    /// <summary>
-    /// Helpers to work with parallel code in a highly optimized manner.
-    /// </summary>
-    public static partial class ParallelHelper
-    {
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IRefAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="Memory2D{T}"/> representing the data to process.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ForEach<TItem, TAction>(Memory2D<TItem> memory)
-            where TAction : struct, IRefAction<TItem>
-        {
-            ForEach(memory, default(TAction), 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IRefAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="Memory2D{T}"/> representing the data to process.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ForEach<TItem, TAction>(Memory2D<TItem> memory, int minimumActionsPerThread)
-            where TAction : struct, IRefAction<TItem>
-        {
-            ForEach(memory, default(TAction), minimumActionsPerThread);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IRefAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="Memory2D{T}"/> representing the data to process.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ForEach<TItem, TAction>(Memory2D<TItem> memory, in TAction action)
-            where TAction : struct, IRefAction<TItem>
-        {
-            ForEach(memory, action, 1);
-        }
-
-        /// <summary>
-        /// Executes a specified action in an optimized parallel loop over the input data.
-        /// </summary>
-        /// <typeparam name="TItem">The type of items to iterate over.</typeparam>
-        /// <typeparam name="TAction">The type of action (implementing <see cref="IRefAction{T}"/> of <typeparamref name="TItem"/>) to invoke over each item.</typeparam>
-        /// <param name="memory">The input <see cref="Memory2D{T}"/> representing the data to process.</param>
-        /// <param name="action">The <typeparamref name="TAction"/> instance representing the action to invoke.</param>
-        /// <param name="minimumActionsPerThread">
-        /// The minimum number of actions to run per individual thread. Set to 1 if all invocations
-        /// should be parallelized, or to a greater number if each individual invocation is fast
-        /// enough that it is more efficient to set a lower bound per each running thread.
-        /// </param>
-        public static void ForEach<TItem, TAction>(Memory2D<TItem> memory, in TAction action, int minimumActionsPerThread)
-            where TAction : struct, IRefAction<TItem>
-        {
-            if (minimumActionsPerThread <= 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForInvalidMinimumActionsPerThread();
-            }
-
-            if (memory.IsEmpty)
-            {
-                return;
-            }
-
-            // The underlying data for a Memory2D<T> instance is bound to int.MaxValue in both
-            // axes, but its total size can exceed this value. Because of this, we calculate
-            // the target chunks as nint to avoid overflows, and switch back to int values
-            // for the rest of the setup, since the number of batches is bound to the number
-            // of CPU cores (which is an int), and the height of each batch is necessarily
-            // smaller than or equal than int.MaxValue, as it can't be greater than the
-            // number of total batches, which again is capped at the number of CPU cores.
-            nint
-                maxBatches = 1 + ((memory.Length - 1) / minimumActionsPerThread),
-                clipBatches = maxBatches <= memory.Height ? maxBatches : memory.Height;
-            int
-                cores = Environment.ProcessorCount,
-                numBatches = (int)(clipBatches <= cores ? clipBatches : cores),
-                batchHeight = 1 + ((memory.Height - 1) / numBatches);
-
-            var actionInvoker = new RefActionInvokerWithReadOnlyMemory2D<TItem, TAction>(batchHeight, memory, action);
-
-            // Skip the parallel invocation when possible
-            if (numBatches == 1)
-            {
-                actionInvoker.Invoke(0);
-
-                return;
-            }
-
-            // Run the batched operations in parallel
-            Parallel.For(
-                0,
-                numBatches,
-                new ParallelOptions { MaxDegreeOfParallelism = numBatches },
-                actionInvoker.Invoke);
-        }
-
-        // Wrapping struct acting as explicit closure to execute the processing batches
-        private readonly struct RefActionInvokerWithReadOnlyMemory2D<TItem, TAction>
-            where TAction : struct, IRefAction<TItem>
-        {
-            private readonly int batchHeight;
-            private readonly Memory2D<TItem> memory;
-            private readonly TAction action;
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public RefActionInvokerWithReadOnlyMemory2D(
-                int batchHeight,
-                Memory2D<TItem> memory,
-                in TAction action)
-            {
-                this.batchHeight = batchHeight;
-                this.memory = memory;
-                this.action = action;
-            }
-
-            /// <summary>
-            /// Processes the batch of actions at a specified index
-            /// </summary>
-            /// <param name="i">The index of the batch to process</param>
-            public void Invoke(int i)
-            {
-                int lowY = i * this.batchHeight;
-                nint highY = lowY + this.batchHeight;
-                int
-                    stopY = (int)(highY <= this.memory.Height ? highY : this.memory.Height),
-                    width = this.memory.Width;
-
-                ReadOnlySpan2D<TItem> span = this.memory.Span;
-
-                for (int y = lowY; y < stopY; y++)
-                {
-                    ref TItem rStart = ref span.DangerousGetReferenceAt(y, 0);
-                    ref TItem rEnd = ref Unsafe.Add(ref rStart, width);
-
-                    while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
-                    {
-                        Unsafe.AsRef(this.action).Invoke(ref rStart);
-
-                        rStart = ref Unsafe.Add(ref rStart, 1);
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ThrowExceptions.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ThrowExceptions.cs
deleted file mode 100644
index 5d9941d5d49..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ThrowExceptions.cs
+++ /dev/null
@@ -1,60 +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.HighPerformance.Helpers
-{
-    /// <summary>
-    /// Helpers to work with parallel code in a highly optimized manner.
-    /// </summary>
-    public static partial class ParallelHelper
-    {
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when an invalid parameter is specified for the minimum actions per thread.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForInvalidMinimumActionsPerThread()
-        {
-            // Having the argument name here manually typed is
-            // not ideal, but this way we save passing that string as
-            // a parameter, since it's always the same anyway.
-            // Same goes for the other helper methods below.
-            throw new ArgumentOutOfRangeException(
-                "minimumActionsPerThread",
-                "Each thread needs to perform at least one action");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when an invalid start parameter is specified for 1D loops.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForStartGreaterThanEnd()
-        {
-            throw new ArgumentOutOfRangeException("start", "The start parameter must be less than or equal to end");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when a range has an index starting from an end.
-        /// </summary>
-        private static void ThrowArgumentExceptionForRangeIndexFromEnd(string name)
-        {
-            throw new ArgumentException("The bounds of the range can't start from an end", name);
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when an invalid top parameter is specified for 2D loops.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForTopGreaterThanBottom()
-        {
-            throw new ArgumentOutOfRangeException("top", "The top parameter must be less than or equal to bottom");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when an invalid left parameter is specified for 2D loops.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForLeftGreaterThanRight()
-        {
-            throw new ArgumentOutOfRangeException("left", "The left parameter must be less than or equal to right");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Memory/Internals/OverflowHelper.cs b/Microsoft.Toolkit.HighPerformance/Memory/Internals/OverflowHelper.cs
deleted file mode 100644
index b3385666d46..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Memory/Internals/OverflowHelper.cs
+++ /dev/null
@@ -1,72 +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;
-using static System.Math;
-
-namespace Microsoft.Toolkit.HighPerformance.Memory.Internals
-{
-    /// <summary>
-    /// A helper to validate arithmetic operations for <see cref="Memory2D{T}"/> and <see cref="Span2D{T}"/>.
-    /// </summary>
-    internal static class OverflowHelper
-    {
-        /// <summary>
-        /// Ensures that the input parameters will not exceed the maximum native int value when indexing.
-        /// </summary>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map (the distance between each row).</param>
-        /// <exception cref="OverflowException">Throw when the inputs don't fit in the expected range.</exception>
-        /// <remarks>The input parameters are assumed to always be positive.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void EnsureIsInNativeIntRange(int height, int width, int pitch)
-        {
-            // As per the layout used in the Memory2D<T> and Span2D<T> types, we have the
-            // following memory representation with respect to height, width and pitch:
-            //
-            //               _________width_________  ________...
-            //              /                       \/
-            // | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- |_
-            // | -- | -- | XX | XX | XX | XX | XX | XX | -- | -- | |
-            // | -- | -- | XX | XX | XX | XX | XX | XX | -- | -- | |
-            // | -- | -- | XX | XX | XX | XX | XX | XX | -- | -- | |_height
-            // | -- | -- | XX | XX | XX | XX | XX | XX | -- | -- |_|
-            // | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- |
-            // | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- |
-            // ...__pitch__/
-            //
-            // The indexing logic works on nint values in unchecked mode, with no overflow checks,
-            // which means it relies on the maximum element index to always be within <= nint.MaxValue.
-            // To ensure no overflows will ever occur there, we need to ensure that no instance can be
-            // created with parameters that could cause an overflow in case any item was accessed, so we
-            // need to ensure no overflows occurs when calculating the index of the last item in each view.
-            // The logic below calculates that index with overflow checks, throwing if one is detected.
-            // Note that we're subtracting 1 to the height as we don't want to include the trailing pitch
-            // for the 2D memory area, and also 1 to the width as the index is 0-based, as usual.
-            // Additionally, we're also ensuring that the stride is never greater than int.MaxValue, for
-            // consistency with how ND arrays work (int.MaxValue as upper bound for each axis), and to
-            // allow for faster iteration in the RefEnumerable<T> type, when traversing columns.
-            _ = checked(((nint)(width + pitch) * Max(unchecked(height - 1), 0)) + Max(unchecked(width - 1), 0));
-        }
-
-        /// <summary>
-        /// Ensures that the input parameters will not exceed <see cref="int.MaxValue"/> when indexing.
-        /// </summary>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map (the distance between each row).</param>
-        /// <returns>The area resulting from the given parameters.</returns>
-        /// <exception cref="OverflowException">Throw when the inputs don't fit in the expected range.</exception>
-        /// <remarks>The input parameters are assumed to always be positive.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int ComputeInt32Area(int height, int width, int pitch)
-        {
-            return checked(((width + pitch) * Max(unchecked(height - 1), 0)) + width);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Memory/Internals/ThrowHelper.cs b/Microsoft.Toolkit.HighPerformance/Memory/Internals/ThrowHelper.cs
deleted file mode 100644
index 5cd58070915..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Memory/Internals/ThrowHelper.cs
+++ /dev/null
@@ -1,130 +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.HighPerformance.Memory.Internals
-{
-    /// <summary>
-    /// A helper class to throw exceptions for memory types.
-    /// </summary>
-    internal static class ThrowHelper
-    {
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when using the <see langword="void"/>* constructor with a managed type.
-        /// </summary>
-        public static void ThrowArgumentExceptionForManagedType()
-        {
-            throw new ArgumentException("Can't use a void* constructor when T is a managed type");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when the target span is too short.
-        /// </summary>
-        public static void ThrowArgumentExceptionForDestinationTooShort()
-        {
-            throw new ArgumentException("The target span is too short to copy all the current items to");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when the target span does not have the same shape as the source.
-        /// </summary>
-        public static void ThrowArgumentExceptionForDestinationWithNotSameShape()
-        {
-            throw new ArgumentException("The target span does not have the same shape as the source one");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArrayTypeMismatchException"/> when using an array of an invalid type.
-        /// </summary>
-        public static void ThrowArrayTypeMismatchException()
-        {
-            throw new ArrayTypeMismatchException("The given array doesn't match the specified type T");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when using an array of an invalid type.
-        /// </summary>
-        public static void ThrowArgumentExceptionForUnsupportedType()
-        {
-            throw new ArgumentException("The specified object type is not supported");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="IndexOutOfRangeException"/> when the a given coordinate is invalid.
-        /// </summary>
-        /// <remarks>
-        /// Throwing <see cref="IndexOutOfRangeException"/> is technically discouraged in the docs, but
-        /// we're doing that here for consistency with the official <see cref="Span{T}"/> type(s) from the BCL.
-        /// </remarks>
-        public static void ThrowIndexOutOfRangeException()
-        {
-            throw new IndexOutOfRangeException();
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when more than one parameter are invalid.
-        /// </summary>
-        public static void ThrowArgumentException()
-        {
-            throw new ArgumentException("One or more input parameters were invalid");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "depth" parameter is invalid.
-        /// </summary>
-        public static void ThrowArgumentOutOfRangeExceptionForDepth()
-        {
-            throw new ArgumentOutOfRangeException("depth");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "row" parameter is invalid.
-        /// </summary>
-        public static void ThrowArgumentOutOfRangeExceptionForRow()
-        {
-            throw new ArgumentOutOfRangeException("row");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "column" parameter is invalid.
-        /// </summary>
-        public static void ThrowArgumentOutOfRangeExceptionForColumn()
-        {
-            throw new ArgumentOutOfRangeException("column");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "offset" parameter is invalid.
-        /// </summary>
-        public static void ThrowArgumentOutOfRangeExceptionForOffset()
-        {
-            throw new ArgumentOutOfRangeException("offset");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "height" parameter is invalid.
-        /// </summary>
-        public static void ThrowArgumentOutOfRangeExceptionForHeight()
-        {
-            throw new ArgumentOutOfRangeException("height");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "width" parameter is invalid.
-        /// </summary>
-        public static void ThrowArgumentOutOfRangeExceptionForWidth()
-        {
-            throw new ArgumentOutOfRangeException("width");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the "pitch" parameter is invalid.
-        /// </summary>
-        public static void ThrowArgumentOutOfRangeExceptionForPitch()
-        {
-            throw new ArgumentOutOfRangeException("pitch");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Memory/Memory2D{T}.cs b/Microsoft.Toolkit.HighPerformance/Memory/Memory2D{T}.cs
deleted file mode 100644
index be3c6e9f059..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Memory/Memory2D{T}.cs
+++ /dev/null
@@ -1,905 +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.Buffers;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-#if SPAN_RUNTIME_SUPPORT
-using Microsoft.Toolkit.HighPerformance.Buffers.Internals;
-#endif
-using Microsoft.Toolkit.HighPerformance.Helpers;
-using Microsoft.Toolkit.HighPerformance.Memory.Internals;
-using Microsoft.Toolkit.HighPerformance.Memory.Views;
-using static Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-
-#pragma warning disable CA2231
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// <see cref="Memory2D{T}"/> represents a 2D region of arbitrary memory. It is to <see cref="Span2D{T}"/>
-    /// what <see cref="Memory{T}"/> is to <see cref="Span{T}"/>. For further details on how the internal layout
-    /// is structured, see the docs for <see cref="Span2D{T}"/>. The <see cref="Memory2D{T}"/> type can wrap arrays
-    /// of any rank, provided that a valid series of parameters for the target memory area(s) are specified.
-    /// </summary>
-    /// <typeparam name="T">The type of items in the current <see cref="Memory2D{T}"/> instance.</typeparam>
-    [DebuggerTypeProxy(typeof(MemoryDebugView2D<>))]
-    [DebuggerDisplay("{ToString(),raw}")]
-    public readonly struct Memory2D<T> : IEquatable<Memory2D<T>>
-    {
-        /// <summary>
-        /// The target <see cref="object"/> instance, if present.
-        /// </summary>
-        private readonly object? instance;
-
-        /// <summary>
-        /// The initial offset within <see cref="instance"/>.
-        /// </summary>
-        private readonly IntPtr offset;
-
-        /// <summary>
-        /// The height of the specified 2D region.
-        /// </summary>
-        private readonly int height;
-
-        /// <summary>
-        /// The width of the specified 2D region.
-        /// </summary>
-        private readonly int width;
-
-        /// <summary>
-        /// The pitch of the specified 2D region.
-        /// </summary>
-        private readonly int pitch;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Memory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="array">The target array to wrap.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/> or <paramref name="width"/> are invalid.
-        /// </exception>
-        /// <remarks>The total area must match the length of <paramref name="array"/>.</remarks>
-        public Memory2D(T[] array, int height, int width)
-            : this(array, 0, height, width, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Memory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="array">The target array to wrap.</param>
-        /// <param name="offset">The initial offset within <paramref name="array"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="array"/>.
-        /// </exception>
-        public Memory2D(T[] array, int offset, int height, int width, int pitch)
-        {
-            if (array.IsCovariant())
-            {
-                ThrowHelper.ThrowArrayTypeMismatchException();
-            }
-
-            if ((uint)offset > (uint)array.Length)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForOffset();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            int
-                area = OverflowHelper.ComputeInt32Area(height, width, pitch),
-                remaining = array.Length - offset;
-
-            if (area > remaining)
-            {
-                ThrowHelper.ThrowArgumentException();
-            }
-
-            this.instance = array;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(offset));
-            this.height = height;
-            this.width = width;
-            this.pitch = pitch;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Memory2D{T}"/> struct wrapping a 2D array.
-        /// </summary>
-        /// <param name="array">The given 2D array to wrap.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        public Memory2D(T[,]? array)
-        {
-            if (array is null)
-            {
-                this = default;
-
-                return;
-            }
-
-            if (array.IsCovariant())
-            {
-                ThrowHelper.ThrowArrayTypeMismatchException();
-            }
-
-            this.instance = array;
-            this.offset = GetArray2DDataByteOffset<T>();
-            this.height = array.GetLength(0);
-            this.width = array.GetLength(1);
-            this.pitch = 0;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Memory2D{T}"/> struct wrapping a 2D array.
-        /// </summary>
-        /// <param name="array">The given 2D array to wrap.</param>
-        /// <param name="row">The target row to map within <paramref name="array"/>.</param>
-        /// <param name="column">The target column to map within <paramref name="array"/>.</param>
-        /// <param name="height">The height to map within <paramref name="array"/>.</param>
-        /// <param name="width">The width to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when either <paramref name="height"/>, <paramref name="width"/> or <paramref name="height"/>
-        /// are negative or not within the bounds that are valid for <paramref name="array"/>.
-        /// </exception>
-        public Memory2D(T[,]? array, int row, int column, int height, int width)
-        {
-            if (array is null)
-            {
-                if (row != 0 || column != 0 || height != 0 || width != 0)
-                {
-                    ThrowHelper.ThrowArgumentException();
-                }
-
-                this = default;
-
-                return;
-            }
-
-            if (array.IsCovariant())
-            {
-                ThrowHelper.ThrowArrayTypeMismatchException();
-            }
-
-            int
-                rows = array.GetLength(0),
-                columns = array.GetLength(1);
-
-            if ((uint)row >= (uint)rows)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            if ((uint)column >= (uint)columns)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            if ((uint)height > (uint)(rows - row))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if ((uint)width > (uint)(columns - column))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            this.instance = array;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(row, column));
-            this.height = height;
-            this.width = width;
-            this.pitch = columns - width;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Memory2D{T}"/> struct wrapping a layer in a 3D array.
-        /// </summary>
-        /// <param name="array">The given 3D array to wrap.</param>
-        /// <param name="depth">The target layer to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when a parameter is invalid.</exception>
-        public Memory2D(T[,,] array, int depth)
-        {
-            if (array.IsCovariant())
-            {
-                ThrowHelper.ThrowArrayTypeMismatchException();
-            }
-
-            if ((uint)depth >= (uint)array.GetLength(0))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForDepth();
-            }
-
-            this.instance = array;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(depth, 0, 0));
-            this.height = array.GetLength(1);
-            this.width = array.GetLength(2);
-            this.pitch = 0;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Memory2D{T}"/> struct wrapping a layer in a 3D array.
-        /// </summary>
-        /// <param name="array">The given 3D array to wrap.</param>
-        /// <param name="depth">The target layer to map within <paramref name="array"/>.</param>
-        /// <param name="row">The target row to map within <paramref name="array"/>.</param>
-        /// <param name="column">The target column to map within <paramref name="array"/>.</param>
-        /// <param name="height">The height to map within <paramref name="array"/>.</param>
-        /// <param name="width">The width to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when a parameter is invalid.</exception>
-        public Memory2D(T[,,] array, int depth, int row, int column, int height, int width)
-        {
-            if (array.IsCovariant())
-            {
-                ThrowHelper.ThrowArrayTypeMismatchException();
-            }
-
-            if ((uint)depth >= (uint)array.GetLength(0))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForDepth();
-            }
-
-            int
-                rows = array.GetLength(1),
-                columns = array.GetLength(2);
-
-            if ((uint)row >= (uint)rows)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            if ((uint)column >= (uint)columns)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            if ((uint)height > (uint)(rows - row))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if ((uint)width > (uint)(columns - column))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            this.instance = array;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(depth, row, column));
-            this.height = height;
-            this.width = width;
-            this.pitch = columns - width;
-        }
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Memory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="memoryManager">The target <see cref="MemoryManager{T}"/> to wrap.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/> or <paramref name="width"/> are invalid.
-        /// </exception>
-        /// <remarks>The total area must match the length of <paramref name="memoryManager"/>.</remarks>
-        public Memory2D(MemoryManager<T> memoryManager, int height, int width)
-            : this(memoryManager, 0, height, width, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Memory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="memoryManager">The target <see cref="MemoryManager{T}"/> to wrap.</param>
-        /// <param name="offset">The initial offset within <paramref name="memoryManager"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="memoryManager"/>.
-        /// </exception>
-        public Memory2D(MemoryManager<T> memoryManager, int offset, int height, int width, int pitch)
-        {
-            int length = memoryManager.GetSpan().Length;
-
-            if ((uint)offset > (uint)length)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForOffset();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            if (width == 0 || height == 0)
-            {
-                this = default;
-
-                return;
-            }
-
-            int
-                area = OverflowHelper.ComputeInt32Area(height, width, pitch),
-                remaining = length - offset;
-
-            if (area > remaining)
-            {
-                ThrowHelper.ThrowArgumentException();
-            }
-
-            this.instance = memoryManager;
-            this.offset = (nint)(uint)offset;
-            this.height = height;
-            this.width = width;
-            this.pitch = pitch;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Memory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="memory">The target <see cref="Memory{T}"/> to wrap.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/> or <paramref name="width"/> are invalid.
-        /// </exception>
-        /// <remarks>The total area must match the length of <paramref name="memory"/>.</remarks>
-        internal Memory2D(Memory<T> memory, int height, int width)
-            : this(memory, 0, height, width, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Memory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="memory">The target <see cref="Memory{T}"/> to wrap.</param>
-        /// <param name="offset">The initial offset within <paramref name="memory"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="memory"/>.
-        /// </exception>
-        internal Memory2D(Memory<T> memory, int offset, int height, int width, int pitch)
-        {
-            if ((uint)offset > (uint)memory.Length)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForOffset();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            if (width == 0 || height == 0)
-            {
-                this = default;
-
-                return;
-            }
-
-            int
-                area = OverflowHelper.ComputeInt32Area(height, width, pitch),
-                remaining = memory.Length - offset;
-
-            if (area > remaining)
-            {
-                ThrowHelper.ThrowArgumentException();
-            }
-
-            // Check if the Memory<T> instance wraps a string. This is possible in case
-            // consumers do an unsafe cast for the entire Memory<T> object, and while not
-            // really safe it is still supported in CoreCLR too, so we're following suit here.
-            if (typeof(T) == typeof(char) &&
-                MemoryMarshal.TryGetString(Unsafe.As<Memory<T>, Memory<char>>(ref memory), out string? text, out int textStart, out _))
-            {
-                ref char r0 = ref text.DangerousGetReferenceAt(textStart + offset);
-
-                this.instance = text;
-                this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(text, ref r0);
-            }
-            else if (MemoryMarshal.TryGetArray(memory, out ArraySegment<T> segment))
-            {
-                // Check if the input Memory<T> instance wraps an array we can access.
-                // This is fine, since Memory<T> on its own doesn't control the lifetime
-                // of the underlying array anyway, and this Memory2D<T> type would do the same.
-                // Using the array directly makes retrieving a Span2D<T> faster down the line,
-                // as we no longer have to jump through the boxed Memory<T> first anymore.
-                T[] array = segment.Array!;
-
-                this.instance = array;
-                this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(segment.Offset + offset));
-            }
-            else if (MemoryMarshal.TryGetMemoryManager<T, MemoryManager<T>>(memory, out var memoryManager, out int memoryManagerStart, out _))
-            {
-                this.instance = memoryManager;
-                this.offset = (nint)(uint)(memoryManagerStart + offset);
-            }
-            else
-            {
-                ThrowHelper.ThrowArgumentExceptionForUnsupportedType();
-
-                this.instance = null;
-                this.offset = default;
-            }
-
-            this.height = height;
-            this.width = width;
-            this.pitch = pitch;
-        }
-#endif
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Memory2D{T}"/> struct with the specified parameters.
-        /// </summary>
-        /// <param name="instance">The target <see cref="object"/> instance.</param>
-        /// <param name="offset">The initial offset within <see cref="instance"/>.</param>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private Memory2D(object instance, IntPtr offset, int height, int width, int pitch)
-        {
-            this.instance = instance;
-            this.offset = offset;
-            this.height = height;
-            this.width = width;
-            this.pitch = pitch;
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="Memory2D{T}"/> instance from an arbitrary object.
-        /// </summary>
-        /// <param name="instance">The <see cref="object"/> instance holding the data to map.</param>
-        /// <param name="value">The target reference to point to (it must be within <paramref name="instance"/>).</param>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map.</param>
-        /// <returns>A <see cref="Memory2D{T}"/> instance with the specified parameters.</returns>
-        /// <remarks>The <paramref name="value"/> parameter is not validated, and it's responsibility of the caller to ensure it's valid.</remarks>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        [Pure]
-        public static Memory2D<T> DangerousCreate(object instance, ref T value, int height, int width, int pitch)
-        {
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            OverflowHelper.EnsureIsInNativeIntRange(height, width, pitch);
-
-            IntPtr offset = ObjectMarshal.DangerousGetObjectDataByteOffset(instance, ref value);
-
-            return new Memory2D<T>(instance, offset, height, width, pitch);
-        }
-
-        /// <summary>
-        /// Gets an empty <see cref="Memory2D{T}"/> instance.
-        /// </summary>
-        public static Memory2D<T> Empty => default;
-
-        /// <summary>
-        /// Gets a value indicating whether the current <see cref="Memory2D{T}"/> instance is empty.
-        /// </summary>
-        public bool IsEmpty
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.height == 0 || this.width == 0;
-        }
-
-        /// <summary>
-        /// Gets the length of the current <see cref="Memory2D{T}"/> instance.
-        /// </summary>
-        public nint Length
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => (nint)(uint)this.height * (nint)(uint)this.width;
-        }
-
-        /// <summary>
-        /// Gets the height of the underlying 2D memory area.
-        /// </summary>
-        public int Height
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.height;
-        }
-
-        /// <summary>
-        /// Gets the width of the underlying 2D memory area.
-        /// </summary>
-        public int Width
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.width;
-        }
-
-        /// <summary>
-        /// Gets a <see cref="Span2D{T}"/> instance from the current memory.
-        /// </summary>
-        public Span2D<T> Span
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                if (this.instance is not null)
-                {
-#if SPAN_RUNTIME_SUPPORT
-                    if (this.instance is MemoryManager<T> memoryManager)
-                    {
-                        ref T r0 = ref memoryManager.GetSpan().DangerousGetReference();
-                        ref T r1 = ref Unsafe.Add(ref r0, this.offset);
-
-                        return new Span2D<T>(ref r1, this.height, this.width, this.pitch);
-                    }
-                    else
-                    {
-                        ref T r0 = ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(this.instance, this.offset);
-
-                        return new Span2D<T>(ref r0, this.height, this.width, this.pitch);
-                    }
-#else
-                    return new Span2D<T>(this.instance, this.offset, this.height, this.width, this.pitch);
-#endif
-                }
-
-                return default;
-            }
-        }
-
-#if NETSTANDARD2_1_OR_GREATER
-        /// <summary>
-        /// Slices the current instance with the specified parameters.
-        /// </summary>
-        /// <param name="rows">The target range of rows to select.</param>
-        /// <param name="columns">The target range of columns to select.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="rows"/> or <paramref name="columns"/> are invalid.
-        /// </exception>
-        /// <returns>A new <see cref="Memory2D{T}"/> instance representing a slice of the current one.</returns>
-        public Memory2D<T> this[Range rows, Range columns]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                var (row, height) = rows.GetOffsetAndLength(this.height);
-                var (column, width) = columns.GetOffsetAndLength(this.width);
-
-                return Slice(row, column, height, width);
-            }
-        }
-#endif
-
-        /// <summary>
-        /// Slices the current instance with the specified parameters.
-        /// </summary>
-        /// <param name="row">The target row to map within the current instance.</param>
-        /// <param name="column">The target column to map within the current instance.</param>
-        /// <param name="height">The height to map within the current instance.</param>
-        /// <param name="width">The width to map within the current instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/>, <paramref name="width"/> or <paramref name="height"/>
-        /// are negative or not within the bounds that are valid for the current instance.
-        /// </exception>
-        /// <returns>A new <see cref="Memory2D{T}"/> instance representing a slice of the current one.</returns>
-        [Pure]
-        public Memory2D<T> Slice(int row, int column, int height, int width)
-        {
-            if ((uint)row >= Height)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            if ((uint)column >= this.width)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            if ((uint)height > (Height - row))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if ((uint)width > (this.width - column))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            int
-                shift = ((this.width + this.pitch) * row) + column,
-                pitch = this.pitch + (this.width - width);
-
-            IntPtr offset = this.offset + (shift * Unsafe.SizeOf<T>());
-
-            return new Memory2D<T>(this.instance!, offset, height, width, pitch);
-        }
-
-        /// <summary>
-        /// Copies the contents of this <see cref="Memory2D{T}"/> into a destination <see cref="Memory{T}"/> instance.
-        /// </summary>
-        /// <param name="destination">The destination <see cref="Memory{T}"/> instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="destination" /> is shorter than the source <see cref="Memory2D{T}"/> instance.
-        /// </exception>
-        public void CopyTo(Memory<T> destination) => Span.CopyTo(destination.Span);
-
-        /// <summary>
-        /// Attempts to copy the current <see cref="Memory2D{T}"/> instance to a destination <see cref="Memory{T}"/>.
-        /// </summary>
-        /// <param name="destination">The target <see cref="Memory{T}"/> of the copy operation.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        public bool TryCopyTo(Memory<T> destination) => Span.TryCopyTo(destination.Span);
-
-        /// <summary>
-        /// Copies the contents of this <see cref="Memory2D{T}"/> into a destination <see cref="Memory2D{T}"/> instance.
-        /// For this API to succeed, the target <see cref="Memory2D{T}"/> has to have the same shape as the current one.
-        /// </summary>
-        /// <param name="destination">The destination <see cref="Memory2D{T}"/> instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="destination" /> is shorter than the source <see cref="Memory2D{T}"/> instance.
-        /// </exception>
-        public void CopyTo(Memory2D<T> destination) => Span.CopyTo(destination.Span);
-
-        /// <summary>
-        /// Attempts to copy the current <see cref="Memory2D{T}"/> instance to a destination <see cref="Memory2D{T}"/>.
-        /// For this API to succeed, the target <see cref="Memory2D{T}"/> has to have the same shape as the current one.
-        /// </summary>
-        /// <param name="destination">The target <see cref="Memory2D{T}"/> of the copy operation.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        public bool TryCopyTo(Memory2D<T> destination) => Span.TryCopyTo(destination.Span);
-
-        /// <summary>
-        /// Creates a handle for the memory.
-        /// The GC will not move the memory until the returned <see cref="MemoryHandle"/>
-        /// is disposed, enabling taking and using the memory's address.
-        /// </summary>
-        /// <exception cref="ArgumentException">
-        /// An instance with nonprimitive (non-blittable) members cannot be pinned.
-        /// </exception>
-        /// <returns>A <see cref="MemoryHandle"/> instance wrapping the pinned handle.</returns>
-        public unsafe MemoryHandle Pin()
-        {
-            if (this.instance is not null)
-            {
-                if (this.instance is MemoryManager<T> memoryManager)
-                {
-                    return memoryManager.Pin();
-                }
-
-                GCHandle handle = GCHandle.Alloc(this.instance, GCHandleType.Pinned);
-
-                void* pointer = Unsafe.AsPointer(ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(this.instance, this.offset));
-
-                return new MemoryHandle(pointer, handle);
-            }
-
-            return default;
-        }
-
-        /// <summary>
-        /// Tries to get a <see cref="Memory{T}"/> instance, if the underlying buffer is contiguous and small enough.
-        /// </summary>
-        /// <param name="memory">The resulting <see cref="Memory{T}"/>, in case of success.</param>
-        /// <returns>Whether or not <paramref name="memory"/> was correctly assigned.</returns>
-        public bool TryGetMemory(out Memory<T> memory)
-        {
-            if (this.pitch == 0 &&
-                Length <= int.MaxValue)
-            {
-                // Empty Memory2D<T> instance
-                if (this.instance is null)
-                {
-                    memory = default;
-                }
-                else if (typeof(T) == typeof(char) && this.instance.GetType() == typeof(string))
-                {
-                    string text = Unsafe.As<string>(this.instance)!;
-                    int index = text.AsSpan().IndexOf(in ObjectMarshal.DangerousGetObjectDataReferenceAt<char>(text, this.offset));
-                    ReadOnlyMemory<char> temp = text.AsMemory(index, (int)Length);
-
-                    // The string type could still be present if a user ends up creating a
-                    // Memory2D<T> instance from a string using DangerousCreate. Similarly to
-                    // how CoreCLR handles the equivalent case in Memory<T>, here we just do
-                    // the necessary steps to still retrieve a Memory<T> instance correctly
-                    // wrapping the target string. In this case, it is up to the caller
-                    // to make sure not to ever actually write to the resulting Memory<T>.
-                    memory = MemoryMarshal.AsMemory<T>(Unsafe.As<ReadOnlyMemory<char>, Memory<T>>(ref temp));
-                }
-                else if (this.instance is MemoryManager<T> memoryManager)
-                {
-                    // If the object is a MemoryManager<T>, just slice it as needed
-                    memory = memoryManager.Memory.Slice((int)(nint)this.offset, this.height * this.width);
-                }
-                else if (this.instance.GetType() == typeof(T[]))
-                {
-                    // If it's a T[] array, also handle the initial offset
-                    T[] array = Unsafe.As<T[]>(this.instance)!;
-                    int index = array.AsSpan().IndexOf(ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(array, this.offset));
-
-                    memory = array.AsMemory(index, this.height * this.width);
-                }
-#if SPAN_RUNTIME_SUPPORT
-                else if (this.instance.GetType() == typeof(T[,]) ||
-                         this.instance.GetType() == typeof(T[,,]))
-                {
-                    // If the object is a 2D or 3D array, we can create a Memory<T> from the RawObjectMemoryManager<T> type.
-                    // We just need to use the precomputed offset pointing to the first item in the current instance,
-                    // and the current usable length. We don't need to retrieve the current index, as the manager just offsets.
-                    memory = new RawObjectMemoryManager<T>(this.instance, this.offset, this.height * this.width).Memory;
-                }
-#endif
-                else
-                {
-                    // Reuse a single failure path to reduce
-                    // the number of returns in the method
-                    goto Failure;
-                }
-
-                return true;
-            }
-
-            Failure:
-
-            memory = default;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Copies the contents of the current <see cref="Memory2D{T}"/> instance into a new 2D array.
-        /// </summary>
-        /// <returns>A 2D array containing the data in the current <see cref="Memory2D{T}"/> instance.</returns>
-        [Pure]
-        public T[,] ToArray() => Span.ToArray();
-
-        /// <inheritdoc/>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object? obj)
-        {
-            if (obj is Memory2D<T> memory)
-            {
-                return Equals(memory);
-            }
-
-            if (obj is ReadOnlyMemory2D<T> readOnlyMemory)
-            {
-                return readOnlyMemory.Equals(this);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(Memory2D<T> other)
-        {
-            return
-                this.instance == other.instance &&
-                this.offset == other.offset &&
-                this.height == other.height &&
-                this.width == other.width &&
-                this.pitch == other.pitch;
-        }
-
-        /// <inheritdoc/>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode()
-        {
-            if (this.instance is not null)
-            {
-#if !NETSTANDARD1_4
-                return HashCode.Combine(
-                    RuntimeHelpers.GetHashCode(this.instance),
-                    this.offset,
-                    this.height,
-                    this.width,
-                    this.pitch);
-#else
-                Span<int> values = stackalloc int[]
-                {
-                    RuntimeHelpers.GetHashCode(this.instance),
-                    this.offset.GetHashCode(),
-                    this.height,
-                    this.width,
-                    this.pitch
-                };
-
-                return values.GetDjb2HashCode();
-#endif
-            }
-
-            return 0;
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"Microsoft.Toolkit.HighPerformance.Memory2D<{typeof(T)}>[{this.height}, {this.width}]";
-        }
-
-        /// <summary>
-        /// Defines an implicit conversion of an array to a <see cref="Memory2D{T}"/>
-        /// </summary>
-        public static implicit operator Memory2D<T>(T[,]? array) => new(array);
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlyMemory2D{T}.cs b/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlyMemory2D{T}.cs
deleted file mode 100644
index 60d1c545f12..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlyMemory2D{T}.cs
+++ /dev/null
@@ -1,923 +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.Buffers;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-#if SPAN_RUNTIME_SUPPORT
-using Microsoft.Toolkit.HighPerformance.Buffers.Internals;
-#endif
-using Microsoft.Toolkit.HighPerformance.Helpers;
-using Microsoft.Toolkit.HighPerformance.Memory.Internals;
-using Microsoft.Toolkit.HighPerformance.Memory.Views;
-using static Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-
-#pragma warning disable CA2231
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// A readonly version of <see cref="Memory2D{T}"/>.
-    /// </summary>
-    /// <typeparam name="T">The type of items in the current <see cref="ReadOnlyMemory2D{T}"/> instance.</typeparam>
-    [DebuggerTypeProxy(typeof(MemoryDebugView2D<>))]
-    [DebuggerDisplay("{ToString(),raw}")]
-    public readonly struct ReadOnlyMemory2D<T> : IEquatable<ReadOnlyMemory2D<T>>
-    {
-        /// <summary>
-        /// The target <see cref="object"/> instance, if present.
-        /// </summary>
-        private readonly object? instance;
-
-        /// <summary>
-        /// The initial offset within <see cref="instance"/>.
-        /// </summary>
-        private readonly IntPtr offset;
-
-        /// <summary>
-        /// The height of the specified 2D region.
-        /// </summary>
-        private readonly int height;
-
-        /// <summary>
-        /// The width of the specified 2D region.
-        /// </summary>
-        private readonly int width;
-
-        /// <summary>
-        /// The pitch of the specified 2D region.
-        /// </summary>
-        private readonly int pitch;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyMemory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="text">The target <see cref="string"/> to wrap.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/> or <paramref name="width"/> are invalid.
-        /// </exception>
-        /// <remarks>The total area must match the length of <paramref name="text"/>.</remarks>
-        public ReadOnlyMemory2D(string text, int height, int width)
-            : this(text, 0, height, width, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyMemory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="text">The target <see cref="string"/> to wrap.</param>
-        /// <param name="offset">The initial offset within <paramref name="text"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="text"/>.
-        /// </exception>
-        public ReadOnlyMemory2D(string text, int offset, int height, int width, int pitch)
-        {
-            if ((uint)offset > (uint)text.Length)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForOffset();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            int
-                area = OverflowHelper.ComputeInt32Area(height, width, pitch),
-                remaining = text.Length - offset;
-
-            if (area > remaining)
-            {
-                ThrowHelper.ThrowArgumentException();
-            }
-
-            this.instance = text;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(text, ref text.DangerousGetReferenceAt(offset));
-            this.height = height;
-            this.width = width;
-            this.pitch = pitch;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyMemory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="array">The target array to wrap.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/> or <paramref name="width"/> are invalid.
-        /// </exception>
-        /// <remarks>The total area must match the length of <paramref name="array"/>.</remarks>
-        public ReadOnlyMemory2D(T[] array, int height, int width)
-            : this(array, 0, height, width, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyMemory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="array">The target array to wrap.</param>
-        /// <param name="offset">The initial offset within <paramref name="array"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="array"/>.
-        /// </exception>
-        public ReadOnlyMemory2D(T[] array, int offset, int height, int width, int pitch)
-        {
-            if ((uint)offset > (uint)array.Length)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForOffset();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            int
-                area = OverflowHelper.ComputeInt32Area(height, width, pitch),
-                remaining = array.Length - offset;
-
-            if (area > remaining)
-            {
-                ThrowHelper.ThrowArgumentException();
-            }
-
-            this.instance = array;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(offset));
-            this.height = height;
-            this.width = width;
-            this.pitch = pitch;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyMemory2D{T}"/> struct wrapping a 2D array.
-        /// </summary>
-        /// <param name="array">The given 2D array to wrap.</param>
-        public ReadOnlyMemory2D(T[,]? array)
-        {
-            if (array is null)
-            {
-                this = default;
-
-                return;
-            }
-
-            this.instance = array;
-            this.offset = GetArray2DDataByteOffset<T>();
-            this.height = array.GetLength(0);
-            this.width = array.GetLength(1);
-            this.pitch = 0;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyMemory2D{T}"/> struct wrapping a 2D array.
-        /// </summary>
-        /// <param name="array">The given 2D array to wrap.</param>
-        /// <param name="row">The target row to map within <paramref name="array"/>.</param>
-        /// <param name="column">The target column to map within <paramref name="array"/>.</param>
-        /// <param name="height">The height to map within <paramref name="array"/>.</param>
-        /// <param name="width">The width to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when either <paramref name="height"/>, <paramref name="width"/> or <paramref name="height"/>
-        /// are negative or not within the bounds that are valid for <paramref name="array"/>.
-        /// </exception>
-        public ReadOnlyMemory2D(T[,]? array, int row, int column, int height, int width)
-        {
-            if (array is null)
-            {
-                if (row != 0 || column != 0 || height != 0 || width != 0)
-                {
-                    ThrowHelper.ThrowArgumentException();
-                }
-
-                this = default;
-
-                return;
-            }
-
-            int
-                rows = array.GetLength(0),
-                columns = array.GetLength(1);
-
-            if ((uint)row >= (uint)rows)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            if ((uint)column >= (uint)columns)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            if ((uint)height > (uint)(rows - row))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if ((uint)width > (uint)(columns - column))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            this.instance = array;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(row, column));
-            this.height = height;
-            this.width = width;
-            this.pitch = columns - width;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyMemory2D{T}"/> struct wrapping a layer in a 3D array.
-        /// </summary>
-        /// <param name="array">The given 3D array to wrap.</param>
-        /// <param name="depth">The target layer to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when a parameter is invalid.</exception>
-        public ReadOnlyMemory2D(T[,,] array, int depth)
-        {
-            if ((uint)depth >= (uint)array.GetLength(0))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForDepth();
-            }
-
-            this.instance = array;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(depth, 0, 0));
-            this.height = array.GetLength(1);
-            this.width = array.GetLength(2);
-            this.pitch = 0;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyMemory2D{T}"/> struct wrapping a layer in a 3D array.
-        /// </summary>
-        /// <param name="array">The given 3D array to wrap.</param>
-        /// <param name="depth">The target layer to map within <paramref name="array"/>.</param>
-        /// <param name="row">The target row to map within <paramref name="array"/>.</param>
-        /// <param name="column">The target column to map within <paramref name="array"/>.</param>
-        /// <param name="height">The height to map within <paramref name="array"/>.</param>
-        /// <param name="width">The width to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when a parameter is invalid.</exception>
-        public ReadOnlyMemory2D(T[,,] array, int depth, int row, int column, int height, int width)
-        {
-            if ((uint)depth >= (uint)array.GetLength(0))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForDepth();
-            }
-
-            int
-                rows = array.GetLength(1),
-                columns = array.GetLength(2);
-
-            if ((uint)row >= (uint)rows)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            if ((uint)column >= (uint)columns)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            if ((uint)height > (uint)(rows - row))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if ((uint)width > (uint)(columns - column))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            this.instance = array;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(depth, row, column));
-            this.height = height;
-            this.width = width;
-            this.pitch = columns - width;
-        }
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyMemory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="memoryManager">The target <see cref="MemoryManager{T}"/> to wrap.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/> or <paramref name="width"/> are invalid.
-        /// </exception>
-        /// <remarks>The total area must match the length of <paramref name="memoryManager"/>.</remarks>
-        public ReadOnlyMemory2D(MemoryManager<T> memoryManager, int height, int width)
-            : this(memoryManager, 0, height, width, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyMemory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="memoryManager">The target <see cref="MemoryManager{T}"/> to wrap.</param>
-        /// <param name="offset">The initial offset within <paramref name="memoryManager"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="memoryManager"/>.
-        /// </exception>
-        public ReadOnlyMemory2D(MemoryManager<T> memoryManager, int offset, int height, int width, int pitch)
-        {
-            int length = memoryManager.GetSpan().Length;
-
-            if ((uint)offset > (uint)length)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForOffset();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            if (width == 0 || height == 0)
-            {
-                this = default;
-
-                return;
-            }
-
-            int
-                area = OverflowHelper.ComputeInt32Area(height, width, pitch),
-                remaining = length - offset;
-
-            if (area > remaining)
-            {
-                ThrowHelper.ThrowArgumentException();
-            }
-
-            this.instance = memoryManager;
-            this.offset = (nint)(uint)offset;
-            this.height = height;
-            this.width = width;
-            this.pitch = pitch;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyMemory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="memory">The target <see cref="Memory{T}"/> to wrap.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/> or <paramref name="width"/> are invalid.
-        /// </exception>
-        /// <remarks>The total area must match the length of <paramref name="memory"/>.</remarks>
-        internal ReadOnlyMemory2D(ReadOnlyMemory<T> memory, int height, int width)
-            : this(memory, 0, height, width, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyMemory2D{T}"/> struct.
-        /// </summary>
-        /// <param name="memory">The target <see cref="ReadOnlyMemory{T}"/> to wrap.</param>
-        /// <param name="offset">The initial offset within <paramref name="memory"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="memory"/>.
-        /// </exception>
-        internal ReadOnlyMemory2D(ReadOnlyMemory<T> memory, int offset, int height, int width, int pitch)
-        {
-            if ((uint)offset > (uint)memory.Length)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForOffset();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            if (width == 0 || height == 0)
-            {
-                this = default;
-
-                return;
-            }
-
-            int
-                area = OverflowHelper.ComputeInt32Area(height, width, pitch),
-                remaining = memory.Length - offset;
-
-            if (area > remaining)
-            {
-                ThrowHelper.ThrowArgumentException();
-            }
-
-            // Check the supported underlying objects, like in Memory2D<T>
-            if (typeof(T) == typeof(char) &&
-                MemoryMarshal.TryGetString(Unsafe.As<ReadOnlyMemory<T>, ReadOnlyMemory<char>>(ref memory), out string? text, out int textStart, out _))
-            {
-                ref char r0 = ref text.DangerousGetReferenceAt(textStart + offset);
-
-                this.instance = text;
-                this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(text, ref r0);
-            }
-            else if (MemoryMarshal.TryGetArray(memory, out ArraySegment<T> segment))
-            {
-                T[] array = segment.Array!;
-
-                this.instance = array;
-                this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(segment.Offset + offset));
-            }
-            else if (MemoryMarshal.TryGetMemoryManager<T, MemoryManager<T>>(memory, out var memoryManager, out int memoryManagerStart, out _))
-            {
-                this.instance = memoryManager;
-                this.offset = (nint)(uint)(memoryManagerStart + offset);
-            }
-            else
-            {
-                ThrowHelper.ThrowArgumentExceptionForUnsupportedType();
-
-                this.instance = null;
-                this.offset = default;
-            }
-
-            this.height = height;
-            this.width = width;
-            this.pitch = pitch;
-        }
-#endif
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyMemory2D{T}"/> struct with the specified parameters.
-        /// </summary>
-        /// <param name="instance">The target <see cref="object"/> instance.</param>
-        /// <param name="offset">The initial offset within <see cref="instance"/>.</param>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private ReadOnlyMemory2D(object instance, IntPtr offset, int height, int width, int pitch)
-        {
-            this.instance = instance;
-            this.offset = offset;
-            this.height = height;
-            this.width = width;
-            this.pitch = pitch;
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="ReadOnlyMemory2D{T}"/> instance from an arbitrary object.
-        /// </summary>
-        /// <param name="instance">The <see cref="object"/> instance holding the data to map.</param>
-        /// <param name="value">The target reference to point to (it must be within <paramref name="instance"/>).</param>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map.</param>
-        /// <returns>A <see cref="ReadOnlyMemory2D{T}"/> instance with the specified parameters.</returns>
-        /// <remarks>The <paramref name="value"/> parameter is not validated, and it's responsibility of the caller to ensure it's valid.</remarks>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        [Pure]
-        public static ReadOnlyMemory2D<T> DangerousCreate(object instance, ref T value, int height, int width, int pitch)
-        {
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            OverflowHelper.EnsureIsInNativeIntRange(height, width, pitch);
-
-            IntPtr offset = ObjectMarshal.DangerousGetObjectDataByteOffset(instance, ref value);
-
-            return new ReadOnlyMemory2D<T>(instance, offset, height, width, pitch);
-        }
-
-        /// <summary>
-        /// Gets an empty <see cref="ReadOnlyMemory2D{T}"/> instance.
-        /// </summary>
-        public static ReadOnlyMemory2D<T> Empty => default;
-
-        /// <summary>
-        /// Gets a value indicating whether the current <see cref="ReadOnlyMemory2D{T}"/> instance is empty.
-        /// </summary>
-        public bool IsEmpty
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.height == 0 || this.width == 0;
-        }
-
-        /// <summary>
-        /// Gets the length of the current <see cref="ReadOnlyMemory2D{T}"/> instance.
-        /// </summary>
-        public nint Length
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => (nint)(uint)this.height * (nint)(uint)this.width;
-        }
-
-        /// <summary>
-        /// Gets the height of the underlying 2D memory area.
-        /// </summary>
-        public int Height
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.height;
-        }
-
-        /// <summary>
-        /// Gets the width of the underlying 2D memory area.
-        /// </summary>
-        public int Width
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.width;
-        }
-
-        /// <summary>
-        /// Gets a <see cref="ReadOnlySpan2D{T}"/> instance from the current memory.
-        /// </summary>
-        public ReadOnlySpan2D<T> Span
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                if (this.instance is not null)
-                {
-#if SPAN_RUNTIME_SUPPORT
-                    if (this.instance is MemoryManager<T> memoryManager)
-                    {
-                        ref T r0 = ref memoryManager.GetSpan().DangerousGetReference();
-                        ref T r1 = ref Unsafe.Add(ref r0, this.offset);
-
-                        return new ReadOnlySpan2D<T>(in r1, this.height, this.width, this.pitch);
-                    }
-                    else
-                    {
-                        // This handles both arrays and strings
-                        ref T r0 = ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(this.instance, this.offset);
-
-                        return new ReadOnlySpan2D<T>(in r0, this.height, this.width, this.pitch);
-                    }
-#else
-                    return new ReadOnlySpan2D<T>(this.instance, this.offset, this.height, this.width, this.pitch);
-#endif
-                }
-
-                return default;
-            }
-        }
-
-#if NETSTANDARD2_1_OR_GREATER
-        /// <summary>
-        /// Slices the current instance with the specified parameters.
-        /// </summary>
-        /// <param name="rows">The target range of rows to select.</param>
-        /// <param name="columns">The target range of columns to select.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="rows"/> or <paramref name="columns"/> are invalid.
-        /// </exception>
-        /// <returns>A new <see cref="ReadOnlyMemory2D{T}"/> instance representing a slice of the current one.</returns>
-        public ReadOnlyMemory2D<T> this[Range rows, Range columns]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                var (row, height) = rows.GetOffsetAndLength(this.height);
-                var (column, width) = columns.GetOffsetAndLength(this.width);
-
-                return Slice(row, column, height, width);
-            }
-        }
-#endif
-
-        /// <summary>
-        /// Slices the current instance with the specified parameters.
-        /// </summary>
-        /// <param name="row">The target row to map within the current instance.</param>
-        /// <param name="column">The target column to map within the current instance.</param>
-        /// <param name="height">The height to map within the current instance.</param>
-        /// <param name="width">The width to map within the current instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/>, <paramref name="width"/> or <paramref name="height"/>
-        /// are negative or not within the bounds that are valid for the current instance.
-        /// </exception>
-        /// <returns>A new <see cref="ReadOnlyMemory2D{T}"/> instance representing a slice of the current one.</returns>
-        [Pure]
-        public ReadOnlyMemory2D<T> Slice(int row, int column, int height, int width)
-        {
-            if ((uint)row >= Height)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            if ((uint)column >= this.width)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            if ((uint)height > (Height - row))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if ((uint)width > (this.width - column))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            int
-                shift = ((this.width + this.pitch) * row) + column,
-                pitch = this.pitch + (this.width - width);
-
-            IntPtr offset = this.offset + (shift * Unsafe.SizeOf<T>());
-
-            return new ReadOnlyMemory2D<T>(this.instance!, offset, height, width, pitch);
-        }
-
-        /// <summary>
-        /// Copies the contents of this <see cref="ReadOnlyMemory2D{T}"/> into a destination <see cref="Memory{T}"/> instance.
-        /// </summary>
-        /// <param name="destination">The destination <see cref="Memory{T}"/> instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="destination" /> is shorter than the source <see cref="ReadOnlyMemory2D{T}"/> instance.
-        /// </exception>
-        public void CopyTo(Memory<T> destination) => Span.CopyTo(destination.Span);
-
-        /// <summary>
-        /// Attempts to copy the current <see cref="ReadOnlyMemory2D{T}"/> instance to a destination <see cref="Memory{T}"/>.
-        /// </summary>
-        /// <param name="destination">The target <see cref="Memory{T}"/> of the copy operation.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        public bool TryCopyTo(Memory<T> destination) => Span.TryCopyTo(destination.Span);
-
-        /// <summary>
-        /// Copies the contents of this <see cref="ReadOnlyMemory2D{T}"/> into a destination <see cref="Memory2D{T}"/> instance.
-        /// For this API to succeed, the target <see cref="Memory2D{T}"/> has to have the same shape as the current one.
-        /// </summary>
-        /// <param name="destination">The destination <see cref="Memory2D{T}"/> instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="destination" /> is shorter than the source <see cref="ReadOnlyMemory2D{T}"/> instance.
-        /// </exception>
-        public void CopyTo(Memory2D<T> destination) => Span.CopyTo(destination.Span);
-
-        /// <summary>
-        /// Attempts to copy the current <see cref="ReadOnlyMemory2D{T}"/> instance to a destination <see cref="Memory2D{T}"/>.
-        /// For this API to succeed, the target <see cref="Memory2D{T}"/> has to have the same shape as the current one.
-        /// </summary>
-        /// <param name="destination">The target <see cref="Memory2D{T}"/> of the copy operation.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        public bool TryCopyTo(Memory2D<T> destination) => Span.TryCopyTo(destination.Span);
-
-        /// <summary>
-        /// Creates a handle for the memory.
-        /// The GC will not move the memory until the returned <see cref="MemoryHandle"/>
-        /// is disposed, enabling taking and using the memory's address.
-        /// </summary>
-        /// <exception cref="ArgumentException">
-        /// An instance with nonprimitive (non-blittable) members cannot be pinned.
-        /// </exception>
-        /// <returns>A <see cref="MemoryHandle"/> instance wrapping the pinned handle.</returns>
-        public unsafe MemoryHandle Pin()
-        {
-            if (this.instance is not null)
-            {
-                if (this.instance is MemoryManager<T> memoryManager)
-                {
-                    return memoryManager.Pin();
-                }
-
-                GCHandle handle = GCHandle.Alloc(this.instance, GCHandleType.Pinned);
-
-                void* pointer = Unsafe.AsPointer(ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(this.instance, this.offset));
-
-                return new MemoryHandle(pointer, handle);
-            }
-
-            return default;
-        }
-
-        /// <summary>
-        /// Tries to get a <see cref="ReadOnlyMemory{T}"/> instance, if the underlying buffer is contiguous and small enough.
-        /// </summary>
-        /// <param name="memory">The resulting <see cref="ReadOnlyMemory{T}"/>, in case of success.</param>
-        /// <returns>Whether or not <paramref name="memory"/> was correctly assigned.</returns>
-        public bool TryGetMemory(out ReadOnlyMemory<T> memory)
-        {
-            if (this.pitch == 0 &&
-                Length <= int.MaxValue)
-            {
-                // Empty Memory2D<T> instance
-                if (this.instance is null)
-                {
-                    memory = default;
-                }
-                else if (typeof(T) == typeof(char) && this.instance.GetType() == typeof(string))
-                {
-                    // Here we need to create a Memory<char> from the wrapped string, and to do so we need to do an inverse
-                    // lookup to find the initial index of the string with respect to the byte offset we're currently using,
-                    // which refers to the raw string object data. This can include variable padding or other additional
-                    // fields on different runtimes. The lookup operation is still O(1) and just computes the byte offset
-                    // difference between the start of the Span<char> (which directly wraps just the actual character data
-                    // within the string), and the input reference, which we can get from the byte offset in use. The result
-                    // is the character index which we can use to create the final Memory<char> instance.
-                    string text = Unsafe.As<string>(this.instance)!;
-                    int index = text.AsSpan().IndexOf(in ObjectMarshal.DangerousGetObjectDataReferenceAt<char>(text, this.offset));
-                    ReadOnlyMemory<char> temp = text.AsMemory(index, (int)Length);
-
-                    memory = Unsafe.As<ReadOnlyMemory<char>, ReadOnlyMemory<T>>(ref temp);
-                }
-                else if (this.instance is MemoryManager<T> memoryManager)
-                {
-                    // If the object is a MemoryManager<T>, just slice it as needed
-                    memory = memoryManager.Memory.Slice((int)(nint)this.offset, this.height * this.width);
-                }
-                else if (this.instance.GetType() == typeof(T[]))
-                {
-                    // If it's a T[] array, also handle the initial offset
-                    T[] array = Unsafe.As<T[]>(this.instance)!;
-                    int index = array.AsSpan().IndexOf(ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(array, this.offset));
-
-                    memory = array.AsMemory(index, this.height * this.width);
-                }
-#if SPAN_RUNTIME_SUPPORT
-                else if (this.instance.GetType() == typeof(T[,]) ||
-                         this.instance.GetType() == typeof(T[,,]))
-                {
-                    memory = new RawObjectMemoryManager<T>(this.instance, this.offset, this.height * this.width).Memory;
-                }
-#endif
-                else
-                {
-                    // Reuse a single failure path to reduce
-                    // the number of returns in the method
-                    goto Failure;
-                }
-
-                return true;
-            }
-
-            Failure:
-
-            memory = default;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Copies the contents of the current <see cref="ReadOnlyMemory2D{T}"/> instance into a new 2D array.
-        /// </summary>
-        /// <returns>A 2D array containing the data in the current <see cref="ReadOnlyMemory2D{T}"/> instance.</returns>
-        [Pure]
-        public T[,] ToArray() => Span.ToArray();
-
-        /// <inheritdoc/>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object? obj)
-        {
-            if (obj is ReadOnlyMemory2D<T> readOnlyMemory)
-            {
-                return Equals(readOnlyMemory);
-            }
-
-            if (obj is Memory2D<T> memory)
-            {
-                return Equals(memory);
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(ReadOnlyMemory2D<T> other)
-        {
-            return
-                this.instance == other.instance &&
-                this.offset == other.offset &&
-                this.height == other.height &&
-                this.width == other.width &&
-                this.pitch == other.pitch;
-        }
-
-        /// <inheritdoc/>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode()
-        {
-            if (this.instance is not null)
-            {
-#if !NETSTANDARD1_4
-                return HashCode.Combine(
-                    RuntimeHelpers.GetHashCode(this.instance),
-                    this.offset,
-                    this.height,
-                    this.width,
-                    this.pitch);
-#else
-                Span<int> values = stackalloc int[]
-                {
-                    RuntimeHelpers.GetHashCode(this.instance),
-                    this.offset.GetHashCode(),
-                    this.height,
-                    this.width,
-                    this.pitch
-                };
-
-                return values.GetDjb2HashCode();
-#endif
-            }
-
-            return 0;
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"Microsoft.Toolkit.HighPerformance.ReadOnlyMemory2D<{typeof(T)}>[{this.height}, {this.width}]";
-        }
-
-        /// <summary>
-        /// Defines an implicit conversion of an array to a <see cref="ReadOnlyMemory2D{T}"/>
-        /// </summary>
-        public static implicit operator ReadOnlyMemory2D<T>(T[,]? array) => new(array);
-
-        /// <summary>
-        /// Defines an implicit conversion of a <see cref="Memory2D{T}"/> to a <see cref="ReadOnlyMemory2D{T}"/>
-        /// </summary>
-        public static implicit operator ReadOnlyMemory2D<T>(Memory2D<T> memory) => Unsafe.As<Memory2D<T>, ReadOnlyMemory2D<T>>(ref memory);
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlySpan2D{T}.Enumerator.cs b/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlySpan2D{T}.Enumerator.cs
deleted file mode 100644
index 8f6c50e2f43..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlySpan2D{T}.Enumerator.cs
+++ /dev/null
@@ -1,201 +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;
-using Microsoft.Toolkit.HighPerformance.Enumerables;
-using Microsoft.Toolkit.HighPerformance.Memory.Internals;
-#if SPAN_RUNTIME_SUPPORT
-using System.Runtime.InteropServices;
-#else
-using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-#endif
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <inheritdoc cref="ReadOnlySpan2D{T}"/>
-    public readonly ref partial struct ReadOnlySpan2D<T>
-    {
-        /// <summary>
-        /// Gets an enumerable that traverses items in a specified row.
-        /// </summary>
-        /// <param name="row">The target row to enumerate within the current <see cref="ReadOnlySpan2D{T}"/> instance.</param>
-        /// <returns>A <see cref="ReadOnlyRefEnumerable{T}"/> with target items to enumerate.</returns>
-        /// <remarks>The returned <see cref="ReadOnlyRefEnumerable{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ReadOnlyRefEnumerable<T> GetRow(int row)
-        {
-            if ((uint)row >= Height)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            nint startIndex = (nint)(uint)this.stride * (nint)(uint)row;
-            ref T r0 = ref DangerousGetReference();
-            ref T r1 = ref Unsafe.Add(ref r0, startIndex);
-
-#if SPAN_RUNTIME_SUPPORT
-            return new ReadOnlyRefEnumerable<T>(in r1, Width, 1);
-#else
-            IntPtr offset = RuntimeHelpers.GetObjectDataOrReferenceByteOffset(this.instance, ref r1);
-
-            return new ReadOnlyRefEnumerable<T>(this.instance!, offset, this.width, 1);
-#endif
-        }
-
-        /// <summary>
-        /// Gets an enumerable that traverses items in a specified column.
-        /// </summary>
-        /// <param name="column">The target column to enumerate within the current <see cref="ReadOnlySpan2D{T}"/> instance.</param>
-        /// <returns>A <see cref="ReadOnlyRefEnumerable{T}"/> with target items to enumerate.</returns>
-        /// <remarks>The returned <see cref="ReadOnlyRefEnumerable{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ReadOnlyRefEnumerable<T> GetColumn(int column)
-        {
-            if ((uint)column >= Width)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            ref T r0 = ref DangerousGetReference();
-            ref T r1 = ref Unsafe.Add(ref r0, (nint)(uint)column);
-
-#if SPAN_RUNTIME_SUPPORT
-            return new ReadOnlyRefEnumerable<T>(in r1, Height, this.stride);
-#else
-            IntPtr offset = RuntimeHelpers.GetObjectDataOrReferenceByteOffset(this.instance, ref r1);
-
-            return new ReadOnlyRefEnumerable<T>(this.instance!, offset, Height, this.stride);
-#endif
-        }
-
-        /// <summary>
-        /// Returns an enumerator for the current <see cref="ReadOnlySpan2D{T}"/> instance.
-        /// </summary>
-        /// <returns>
-        /// An enumerator that can be used to traverse the items in the current <see cref="ReadOnlySpan2D{T}"/> instance
-        /// </returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Enumerator GetEnumerator() => new(this);
-
-        /// <summary>
-        /// Provides an enumerator for the elements of a <see cref="ReadOnlySpan2D{T}"/> instance.
-        /// </summary>
-        public ref struct Enumerator
-        {
-#if SPAN_RUNTIME_SUPPORT
-            /// <summary>
-            /// The <see cref="ReadOnlySpan{T}"/> instance pointing to the first item in the target memory area.
-            /// </summary>
-            /// <remarks>Just like in <see cref="ReadOnlySpan2D{T}"/>, the length is the height of the 2D region.</remarks>
-            private readonly ReadOnlySpan<T> span;
-#else
-            /// <summary>
-            /// The target <see cref="object"/> instance, if present.
-            /// </summary>
-            private readonly object? instance;
-
-            /// <summary>
-            /// The initial offset within <see cref="instance"/>.
-            /// </summary>
-            private readonly IntPtr offset;
-
-            /// <summary>
-            /// The height of the specified 2D region.
-            /// </summary>
-            private readonly int height;
-#endif
-
-            /// <summary>
-            /// The width of the specified 2D region.
-            /// </summary>
-            private readonly int width;
-
-            /// <summary>
-            /// The stride of the specified 2D region.
-            /// </summary>
-            private readonly int stride;
-
-            /// <summary>
-            /// The current horizontal offset.
-            /// </summary>
-            private int x;
-
-            /// <summary>
-            /// The current vertical offset.
-            /// </summary>
-            private int y;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Enumerator"/> struct.
-            /// </summary>
-            /// <param name="span">The target <see cref="ReadOnlySpan2D{T}"/> instance to enumerate.</param>
-            internal Enumerator(ReadOnlySpan2D<T> span)
-            {
-#if SPAN_RUNTIME_SUPPORT
-                this.span = span.span;
-#else
-                this.instance = span.instance;
-                this.offset = span.offset;
-                this.height = span.height;
-#endif
-                this.width = span.width;
-                this.stride = span.stride;
-                this.x = -1;
-                this.y = 0;
-            }
-
-            /// <summary>
-            /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
-            /// </summary>
-            /// <returns><see langword="true"/> whether a new element is available, <see langword="false"/> otherwise</returns>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public bool MoveNext()
-            {
-                int x = this.x + 1;
-
-                // Horizontal move, within range
-                if (x < this.width)
-                {
-                    this.x = x;
-
-                    return true;
-                }
-
-                // We reached the end of a row and there is at least
-                // another row available: wrap to a new line and continue.
-                this.x = 0;
-
-#if SPAN_RUNTIME_SUPPORT
-                return ++this.y < this.span.Length;
-#else
-                return ++this.y < this.height;
-#endif
-            }
-
-            /// <summary>
-            /// Gets the duck-typed <see cref="System.Collections.Generic.IEnumerator{T}.Current"/> property.
-            /// </summary>
-            public readonly ref readonly T Current
-            {
-                [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get
-                {
-#if SPAN_RUNTIME_SUPPORT
-                    ref T r0 = ref MemoryMarshal.GetReference(this.span);
-#else
-                    ref T r0 = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.instance, this.offset);
-#endif
-                    nint index = ((nint)(uint)this.y * (nint)(uint)this.stride) + (nint)(uint)this.x;
-
-                    return ref Unsafe.Add(ref r0, index);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlySpan2D{T}.cs b/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlySpan2D{T}.cs
deleted file mode 100644
index 114b6d22a48..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlySpan2D{T}.cs
+++ /dev/null
@@ -1,1035 +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;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-#if !SPAN_RUNTIME_SUPPORT
-using Microsoft.Toolkit.HighPerformance.Helpers;
-#endif
-using Microsoft.Toolkit.HighPerformance.Memory.Internals;
-using Microsoft.Toolkit.HighPerformance.Memory.Views;
-#if !SPAN_RUNTIME_SUPPORT
-using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-#endif
-
-#pragma warning disable CS0809, CA1065
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// A readonly version of <see cref="Span2D{T}"/>.
-    /// </summary>
-    /// <typeparam name="T">The type of items in the current <see cref="ReadOnlySpan2D{T}"/> instance.</typeparam>
-    [DebuggerTypeProxy(typeof(MemoryDebugView2D<>))]
-    [DebuggerDisplay("{ToString(),raw}")]
-    public readonly ref partial struct ReadOnlySpan2D<T>
-    {
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// The <see cref="ReadOnlySpan{T}"/> instance pointing to the first item in the target memory area.
-        /// </summary>
-        private readonly ReadOnlySpan<T> span;
-#else
-        /// <summary>
-        /// The target <see cref="object"/> instance, if present.
-        /// </summary>
-        private readonly object? instance;
-
-        /// <summary>
-        /// The initial offset within <see cref="instance"/>.
-        /// </summary>
-        private readonly IntPtr offset;
-
-        /// <summary>
-        /// The height of the specified 2D region.
-        /// </summary>
-        private readonly int height;
-#endif
-
-        /// <summary>
-        /// The width of the specified 2D region.
-        /// </summary>
-        private readonly int width;
-
-        /// <summary>
-        /// The stride of the specified 2D region.
-        /// </summary>
-        private readonly int stride;
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlySpan2D{T}"/> struct with the specified parameters.
-        /// </summary>
-        /// <param name="value">The reference to the first <typeparamref name="T"/> item to map.</param>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map (the distance between each row).</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal ReadOnlySpan2D(in T value, int height, int width, int pitch)
-        {
-            this.span = MemoryMarshal.CreateReadOnlySpan(ref Unsafe.AsRef(value), height);
-            this.width = width;
-            this.stride = width + pitch;
-        }
-#endif
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlySpan2D{T}"/> struct with the specified parameters.
-        /// </summary>
-        /// <param name="pointer">The pointer to the first <typeparamref name="T"/> item to map.</param>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map (the distance between each row).</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when one of the parameters are negative.</exception>
-        public unsafe ReadOnlySpan2D(void* pointer, int height, int width, int pitch)
-        {
-            if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
-            {
-                ThrowHelper.ThrowArgumentExceptionForManagedType();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            OverflowHelper.EnsureIsInNativeIntRange(height, width, pitch);
-
-#if SPAN_RUNTIME_SUPPORT
-            this.span = new ReadOnlySpan<T>(pointer, height);
-#else
-            this.instance = null;
-            this.offset = (IntPtr)pointer;
-            this.height = height;
-#endif
-            this.width = width;
-            this.stride = width + pitch;
-        }
-
-#if !SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlySpan2D{T}"/> struct with the specified parameters.
-        /// </summary>
-        /// <param name="instance">The target <see cref="object"/> instance.</param>
-        /// <param name="offset">The initial offset within the target instance.</param>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal ReadOnlySpan2D(object? instance, IntPtr offset, int height, int width, int pitch)
-        {
-            this.instance = instance;
-            this.offset = offset;
-            this.height = height;
-            this.width = width;
-            this.stride = width + pitch;
-        }
-#endif
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlySpan2D{T}"/> struct.
-        /// </summary>
-        /// <param name="array">The target array to wrap.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/> or <paramref name="width"/> are invalid.
-        /// </exception>
-        /// <remarks>The total area must match the length of <paramref name="array"/>.</remarks>
-        public ReadOnlySpan2D(T[] array, int height, int width)
-            : this(array, 0, height, width, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlySpan2D{T}"/> struct.
-        /// </summary>
-        /// <param name="array">The target array to wrap.</param>
-        /// <param name="offset">The initial offset within <paramref name="array"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="array"/>.
-        /// </exception>
-        public ReadOnlySpan2D(T[] array, int offset, int height, int width, int pitch)
-        {
-            if ((uint)offset > (uint)array.Length)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForOffset();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            if (width == 0 || height == 0)
-            {
-                this = default;
-
-                return;
-            }
-
-            int
-                area = OverflowHelper.ComputeInt32Area(height, width, pitch),
-                remaining = array.Length - offset;
-
-            if (area > remaining)
-            {
-                ThrowHelper.ThrowArgumentException();
-            }
-
-#if SPAN_RUNTIME_SUPPORT
-            this.span = MemoryMarshal.CreateReadOnlySpan(ref array.DangerousGetReferenceAt(offset), height);
-#else
-            this.instance = array;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(offset));
-            this.height = height;
-#endif
-            this.width = width;
-            this.stride = width + pitch;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlySpan2D{T}"/> struct wrapping a 2D array.
-        /// </summary>
-        /// <param name="array">The given 2D array to wrap.</param>
-        public ReadOnlySpan2D(T[,]? array)
-        {
-            if (array is null)
-            {
-                this = default;
-
-                return;
-            }
-
-#if SPAN_RUNTIME_SUPPORT
-            this.span = MemoryMarshal.CreateReadOnlySpan(ref array.DangerousGetReference(), array.GetLength(0));
-#else
-            this.instance = array;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(0, 0));
-            this.height = array.GetLength(0);
-#endif
-            this.width = this.stride = array.GetLength(1);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlySpan2D{T}"/> struct wrapping a 2D array.
-        /// </summary>
-        /// <param name="array">The given 2D array to wrap.</param>
-        /// <param name="row">The target row to map within <paramref name="array"/>.</param>
-        /// <param name="column">The target column to map within <paramref name="array"/>.</param>
-        /// <param name="height">The height to map within <paramref name="array"/>.</param>
-        /// <param name="width">The width to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when either <paramref name="height"/>, <paramref name="width"/> or <paramref name="height"/>
-        /// are negative or not within the bounds that are valid for <paramref name="array"/>.
-        /// </exception>
-        public ReadOnlySpan2D(T[,]? array, int row, int column, int height, int width)
-        {
-            if (array is null)
-            {
-                if (row != 0 || column != 0 || height != 0 || width != 0)
-                {
-                    ThrowHelper.ThrowArgumentException();
-                }
-
-                this = default;
-
-                return;
-            }
-
-            int
-                rows = array.GetLength(0),
-                columns = array.GetLength(1);
-
-            if ((uint)row >= (uint)rows)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            if ((uint)column >= (uint)columns)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            if ((uint)height > (uint)(rows - row))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if ((uint)width > (uint)(columns - column))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-#if SPAN_RUNTIME_SUPPORT
-            this.span = MemoryMarshal.CreateReadOnlySpan(ref array.DangerousGetReferenceAt(row, column), height);
-#else
-            this.instance = array;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(row, column));
-            this.height = height;
-#endif
-            this.width = width;
-            this.stride = columns;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlySpan2D{T}"/> struct wrapping a layer in a 3D array.
-        /// </summary>
-        /// <param name="array">The given 3D array to wrap.</param>
-        /// <param name="depth">The target layer to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when a parameter is invalid.</exception>
-        public ReadOnlySpan2D(T[,,] array, int depth)
-        {
-            if ((uint)depth >= (uint)array.GetLength(0))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForDepth();
-            }
-
-#if SPAN_RUNTIME_SUPPORT
-            this.span = MemoryMarshal.CreateReadOnlySpan(ref array.DangerousGetReferenceAt(depth, 0, 0), array.GetLength(1));
-#else
-            this.instance = array;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(depth, 0, 0));
-            this.height = array.GetLength(1);
-#endif
-            this.width = this.stride = array.GetLength(2);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlySpan2D{T}"/> struct wrapping a layer in a 3D array.
-        /// </summary>
-        /// <param name="array">The given 3D array to wrap.</param>
-        /// <param name="depth">The target layer to map within <paramref name="array"/>.</param>
-        /// <param name="row">The target row to map within <paramref name="array"/>.</param>
-        /// <param name="column">The target column to map within <paramref name="array"/>.</param>
-        /// <param name="height">The height to map within <paramref name="array"/>.</param>
-        /// <param name="width">The width to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when a parameter is invalid.</exception>
-        public ReadOnlySpan2D(T[,,] array, int depth, int row, int column, int height, int width)
-        {
-            if ((uint)depth >= (uint)array.GetLength(0))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForDepth();
-            }
-
-            int
-                rows = array.GetLength(1),
-                columns = array.GetLength(2);
-
-            if ((uint)row >= (uint)rows)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            if ((uint)column >= (uint)columns)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            if ((uint)height > (uint)(rows - row))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if ((uint)width > (uint)(columns - column))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-#if SPAN_RUNTIME_SUPPORT
-            this.span = MemoryMarshal.CreateReadOnlySpan(ref array.DangerousGetReferenceAt(depth, row, column), height);
-#else
-            this.instance = array;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(depth, row, column));
-            this.height = height;
-#endif
-            this.width = width;
-            this.stride = columns;
-        }
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlySpan2D{T}"/> struct.
-        /// </summary>
-        /// <param name="span">The target <see cref="ReadOnlySpan{T}"/> to wrap.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/> or <paramref name="width"/> are invalid.
-        /// </exception>
-        /// <remarks>The total area must match the length of <paramref name="span"/>.</remarks>
-        internal ReadOnlySpan2D(ReadOnlySpan<T> span, int height, int width)
-            : this(span, 0, height, width, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlySpan2D{T}"/> struct.
-        /// </summary>
-        /// <param name="span">The target <see cref="ReadOnlySpan{T}"/> to wrap.</param>
-        /// <param name="offset">The initial offset within <paramref name="span"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="span"/>.
-        /// </exception>
-        internal ReadOnlySpan2D(ReadOnlySpan<T> span, int offset, int height, int width, int pitch)
-        {
-            if ((uint)offset > (uint)span.Length)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForOffset();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            if (width == 0 || height == 0)
-            {
-                this = default;
-
-                return;
-            }
-
-            int
-                area = OverflowHelper.ComputeInt32Area(height, width, pitch),
-                remaining = span.Length - offset;
-
-            if (area > remaining)
-            {
-                ThrowHelper.ThrowArgumentException();
-            }
-
-            this.span = MemoryMarshal.CreateSpan(ref span.DangerousGetReferenceAt(offset), height);
-            this.width = width;
-            this.stride = width + pitch;
-        }
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="ReadOnlySpan2D{T}"/> struct with the specified parameters.
-        /// </summary>
-        /// <param name="value">The reference to the first <typeparamref name="T"/> item to map.</param>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map (the distance between each row).</param>
-        /// <returns>A <see cref="ReadOnlySpan2D{T}"/> instance with the specified parameters.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when one of the parameters are negative.</exception>
-        [Pure]
-        public static ReadOnlySpan2D<T> DangerousCreate(in T value, int height, int width, int pitch)
-        {
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            OverflowHelper.EnsureIsInNativeIntRange(height, width, pitch);
-
-            return new ReadOnlySpan2D<T>(in value, height, width, pitch);
-        }
-#endif
-
-        /// <summary>
-        /// Gets an empty <see cref="ReadOnlySpan2D{T}"/> instance.
-        /// </summary>
-        public static ReadOnlySpan2D<T> Empty => default;
-
-        /// <summary>
-        /// Gets a value indicating whether the current <see cref="ReadOnlySpan2D{T}"/> instance is empty.
-        /// </summary>
-        public bool IsEmpty
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => Height == 0 || this.width == 0;
-        }
-
-        /// <summary>
-        /// Gets the length of the current <see cref="ReadOnlySpan2D{T}"/> instance.
-        /// </summary>
-        public nint Length
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => (nint)(uint)Height * (nint)(uint)this.width;
-        }
-
-        /// <summary>
-        /// Gets the height of the underlying 2D memory area.
-        /// </summary>
-        public int Height
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-#if SPAN_RUNTIME_SUPPORT
-                return this.span.Length;
-#else
-                return this.height;
-#endif
-            }
-        }
-
-        /// <summary>
-        /// Gets the width of the underlying 2D memory area.
-        /// </summary>
-        public int Width
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.width;
-        }
-
-        /// <summary>
-        /// Gets the element at the specified zero-based indices.
-        /// </summary>
-        /// <param name="row">The target row to get the element from.</param>
-        /// <param name="column">The target column to get the element from.</param>
-        /// <returns>A reference to the element at the specified indices.</returns>
-        /// <exception cref="IndexOutOfRangeException">
-        /// Thrown when either <paramref name="row"/> or <paramref name="column"/> are invalid.
-        /// </exception>
-        public ref readonly T this[int row, int column]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                if ((uint)row >= (uint)Height ||
-                    (uint)column >= (uint)Width)
-                {
-                    ThrowHelper.ThrowIndexOutOfRangeException();
-                }
-
-                return ref DangerousGetReferenceAt(row, column);
-            }
-        }
-
-#if NETSTANDARD2_1_OR_GREATER
-        /// <summary>
-        /// Gets the element at the specified zero-based indices.
-        /// </summary>
-        /// <param name="row">The target row to get the element from.</param>
-        /// <param name="column">The target column to get the element from.</param>
-        /// <returns>A reference to the element at the specified indices.</returns>
-        /// <exception cref="IndexOutOfRangeException">
-        /// Thrown when either <paramref name="row"/> or <paramref name="column"/> are invalid.
-        /// </exception>
-        public ref readonly T this[Index row, Index column]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => ref this[row.GetOffset(Height), column.GetOffset(this.width)];
-        }
-
-        /// <summary>
-        /// Slices the current instance with the specified parameters.
-        /// </summary>
-        /// <param name="rows">The target range of rows to select.</param>
-        /// <param name="columns">The target range of columns to select.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="rows"/> or <paramref name="columns"/> are invalid.
-        /// </exception>
-        /// <returns>A new <see cref="ReadOnlySpan2D{T}"/> instance representing a slice of the current one.</returns>
-        public ReadOnlySpan2D<T> this[Range rows, Range columns]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                var (row, height) = rows.GetOffsetAndLength(Height);
-                var (column, width) = columns.GetOffsetAndLength(this.width);
-
-                return Slice(row, column, height, width);
-            }
-        }
-#endif
-
-        /// <summary>
-        /// Copies the contents of this <see cref="ReadOnlySpan2D{T}"/> into a destination <see cref="Span{T}"/> instance.
-        /// </summary>
-        /// <param name="destination">The destination <see cref="Span{T}"/> instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="destination" /> is shorter than the source <see cref="ReadOnlySpan2D{T}"/> instance.
-        /// </exception>
-        public void CopyTo(Span<T> destination)
-        {
-            if (IsEmpty)
-            {
-                return;
-            }
-
-            if (TryGetSpan(out ReadOnlySpan<T> span))
-            {
-                span.CopyTo(destination);
-            }
-            else
-            {
-                if (Length > destination.Length)
-                {
-                    ThrowHelper.ThrowArgumentExceptionForDestinationTooShort();
-                }
-
-                // Copy each row individually
-#if SPAN_RUNTIME_SUPPORT
-                for (int i = 0, j = 0; i < Height; i++, j += this.width)
-                {
-                    GetRowSpan(i).CopyTo(destination.Slice(j));
-                }
-#else
-                int height = Height;
-                nint width = (nint)(uint)this.width;
-
-                ref T destinationRef = ref MemoryMarshal.GetReference(destination);
-
-                for (int i = 0; i < height; i++)
-                {
-                    ref T sourceStart = ref DangerousGetReferenceAt(i, 0);
-                    ref T sourceEnd = ref Unsafe.Add(ref sourceStart, width);
-
-                    while (Unsafe.IsAddressLessThan(ref sourceStart, ref sourceEnd))
-                    {
-                        destinationRef = sourceStart;
-
-                        sourceStart = ref Unsafe.Add(ref sourceStart, 1);
-                        destinationRef = ref Unsafe.Add(ref destinationRef, 1);
-                    }
-                }
-#endif
-            }
-        }
-
-        /// <summary>
-        /// Copies the contents of this <see cref="ReadOnlySpan2D{T}"/> into a destination <see cref="Span2D{T}"/> instance.
-        /// For this API to succeed, the target <see cref="Span2D{T}"/> has to have the same shape as the current one.
-        /// </summary>
-        /// <param name="destination">The destination <see cref="Span2D{T}"/> instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="destination" /> does not have the same shape as the source <see cref="ReadOnlySpan2D{T}"/> instance.
-        /// </exception>
-        public void CopyTo(Span2D<T> destination)
-        {
-            if (destination.Height != Height ||
-                destination.Width != Width)
-            {
-                ThrowHelper.ThrowArgumentExceptionForDestinationWithNotSameShape();
-            }
-
-            if (IsEmpty)
-            {
-                return;
-            }
-
-            if (destination.TryGetSpan(out Span<T> span))
-            {
-                CopyTo(span);
-            }
-            else
-            {
-                // Copy each row individually
-#if SPAN_RUNTIME_SUPPORT
-                for (int i = 0; i < Height; i++)
-                {
-                    GetRowSpan(i).CopyTo(destination.GetRowSpan(i));
-                }
-#else
-                int height = Height;
-                nint width = (nint)(uint)this.width;
-
-                for (int i = 0; i < height; i++)
-                {
-                    ref T sourceStart = ref DangerousGetReferenceAt(i, 0);
-                    ref T sourceEnd = ref Unsafe.Add(ref sourceStart, width);
-                    ref T destinationRef = ref destination.DangerousGetReferenceAt(i, 0);
-
-                    while (Unsafe.IsAddressLessThan(ref sourceStart, ref sourceEnd))
-                    {
-                        destinationRef = sourceStart;
-
-                        sourceStart = ref Unsafe.Add(ref sourceStart, 1);
-                        destinationRef = ref Unsafe.Add(ref destinationRef, 1);
-                    }
-                }
-#endif
-            }
-        }
-
-        /// <summary>
-        /// Attempts to copy the current <see cref="ReadOnlySpan2D{T}"/> instance to a destination <see cref="Span{T}"/>.
-        /// </summary>
-        /// <param name="destination">The target <see cref="Span{T}"/> of the copy operation.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        public bool TryCopyTo(Span<T> destination)
-        {
-            if (destination.Length >= Length)
-            {
-                CopyTo(destination);
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Attempts to copy the current <see cref="ReadOnlySpan2D{T}"/> instance to a destination <see cref="Span2D{T}"/>.
-        /// </summary>
-        /// <param name="destination">The target <see cref="Span2D{T}"/> of the copy operation.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        public bool TryCopyTo(Span2D<T> destination)
-        {
-            if (destination.Height == Height &&
-                destination.Width == Width)
-            {
-                CopyTo(destination);
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Returns a reference to the 0th element of the <see cref="ReadOnlySpan2D{T}"/> instance. If the current
-        /// instance is empty, returns a <see langword="null"/> reference. It can be used for pinning
-        /// and is required to support the use of span within a fixed statement.
-        /// </summary>
-        /// <returns>A reference to the 0th element, or a <see langword="null"/> reference.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public unsafe ref T GetPinnableReference()
-        {
-            ref T r0 = ref Unsafe.AsRef<T>(null);
-
-            if (Length != 0)
-            {
-#if SPAN_RUNTIME_SUPPORT
-                r0 = ref MemoryMarshal.GetReference(this.span);
-#else
-                r0 = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.instance, this.offset);
-#endif
-            }
-
-            return ref r0;
-        }
-
-        /// <summary>
-        /// Returns a reference to the first element within the current instance, with no bounds check.
-        /// </summary>
-        /// <returns>A reference to the first element within the current instance.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ref T DangerousGetReference()
-        {
-#if SPAN_RUNTIME_SUPPORT
-            return ref MemoryMarshal.GetReference(this.span);
-#else
-            return ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.instance, this.offset);
-#endif
-        }
-
-        /// <summary>
-        /// Returns a reference to a specified element within the current instance, with no bounds check.
-        /// </summary>
-        /// <param name="i">The target row to get the element from.</param>
-        /// <param name="j">The target column to get the element from.</param>
-        /// <returns>A reference to the element at the specified indices.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ref T DangerousGetReferenceAt(int i, int j)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            ref T r0 = ref MemoryMarshal.GetReference(this.span);
-#else
-            ref T r0 = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.instance, this.offset);
-#endif
-            nint index = ((nint)(uint)i * (nint)(uint)this.stride) + (nint)(uint)j;
-
-            return ref Unsafe.Add(ref r0, index);
-        }
-
-        /// <summary>
-        /// Slices the current instance with the specified parameters.
-        /// </summary>
-        /// <param name="row">The target row to map within the current instance.</param>
-        /// <param name="column">The target column to map within the current instance.</param>
-        /// <param name="height">The height to map within the current instance.</param>
-        /// <param name="width">The width to map within the current instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/>, <paramref name="width"/> or <paramref name="height"/>
-        /// are negative or not within the bounds that are valid for the current instance.
-        /// </exception>
-        /// <returns>A new <see cref="ReadOnlySpan2D{T}"/> instance representing a slice of the current one.</returns>
-        [Pure]
-        public ReadOnlySpan2D<T> Slice(int row, int column, int height, int width)
-        {
-            if ((uint)row >= Height)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            if ((uint)column >= this.width)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            if ((uint)height > (Height - row))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if ((uint)width > (this.width - column))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            nint shift = ((nint)(uint)this.stride * (nint)(uint)row) + (nint)(uint)column;
-            int pitch = this.stride - width;
-
-#if SPAN_RUNTIME_SUPPORT
-            ref T r0 = ref this.span.DangerousGetReferenceAt(shift);
-
-            return new ReadOnlySpan2D<T>(in r0, height, width, pitch);
-#else
-            IntPtr offset = this.offset + (shift * (nint)(uint)Unsafe.SizeOf<T>());
-
-            return new ReadOnlySpan2D<T>(this.instance, offset, height, width, pitch);
-#endif
-        }
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Gets a <see cref="ReadOnlySpan{T}"/> for a specified row.
-        /// </summary>
-        /// <param name="row">The index of the target row to retrieve.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Throw when <paramref name="row"/> is out of range.</exception>
-        /// <returns>The resulting row <see cref="ReadOnlySpan{T}"/>.</returns>
-        [Pure]
-        public ReadOnlySpan<T> GetRowSpan(int row)
-        {
-            if ((uint)row >= (uint)Height)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            ref T r0 = ref DangerousGetReferenceAt(row, 0);
-
-            return MemoryMarshal.CreateReadOnlySpan(ref r0, this.width);
-        }
-#endif
-
-        /// <summary>
-        /// Tries to get a <see cref="ReadOnlySpan{T}"/> instance, if the underlying buffer is contiguous and small enough.
-        /// </summary>
-        /// <param name="span">The resulting <see cref="ReadOnlySpan{T}"/>, in case of success.</param>
-        /// <returns>Whether or not <paramref name="span"/> was correctly assigned.</returns>
-        public bool TryGetSpan(out ReadOnlySpan<T> span)
-        {
-            // We can only create a Span<T> if the buffer is contiguous
-            if (this.stride == this.width &&
-                Length <= int.MaxValue)
-            {
-#if SPAN_RUNTIME_SUPPORT
-                span = MemoryMarshal.CreateReadOnlySpan(ref MemoryMarshal.GetReference(this.span), (int)Length);
-
-                return true;
-#else
-                // An empty Span2D<T> is still valid
-                if (IsEmpty)
-                {
-                    span = default;
-
-                    return true;
-                }
-
-                // Pinned ReadOnlySpan2D<T>
-                if (this.instance is null)
-                {
-                    unsafe
-                    {
-                        span = new Span<T>((void*)this.offset, (int)Length);
-                    }
-
-                    return true;
-                }
-
-                // Without Span<T> runtime support, we can only get a Span<T> from a T[] instance
-                if (this.instance.GetType() == typeof(T[]))
-                {
-                    T[] array = Unsafe.As<T[]>(this.instance)!;
-                    int index = array.AsSpan().IndexOf(ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(array, this.offset));
-
-                    span = array.AsSpan(index, (int)Length);
-
-                    return true;
-                }
-#endif
-            }
-
-            span = default;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Copies the contents of the current <see cref="Span2D{T}"/> instance into a new 2D array.
-        /// </summary>
-        /// <returns>A 2D array containing the data in the current <see cref="Span2D{T}"/> instance.</returns>
-        [Pure]
-        public T[,] ToArray()
-        {
-            T[,] array = new T[Height, this.width];
-
-#if SPAN_RUNTIME_SUPPORT
-            CopyTo(array.AsSpan());
-#else
-            // Skip the initialization if the array is empty
-            if (Length > 0)
-            {
-                int height = Height;
-                nint width = (nint)(uint)this.width;
-
-                ref T destinationRef = ref array.DangerousGetReference();
-
-                for (int i = 0; i < height; i++)
-                {
-                    ref T sourceStart = ref DangerousGetReferenceAt(i, 0);
-                    ref T sourceEnd = ref Unsafe.Add(ref sourceStart, width);
-
-                    while (Unsafe.IsAddressLessThan(ref sourceStart, ref sourceEnd))
-                    {
-                        destinationRef = sourceStart;
-
-                        sourceStart = ref Unsafe.Add(ref sourceStart, 1);
-                        destinationRef = ref Unsafe.Add(ref destinationRef, 1);
-                    }
-                }
-            }
-#endif
-
-            return array;
-        }
-
-        /// <inheritdoc cref="ReadOnlySpan{T}.Equals(object)"/>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("Equals() on Span will always throw an exception. Use == instead.")]
-        public override bool Equals(object? obj)
-        {
-            throw new NotSupportedException("Microsoft.Toolkit.HighPerformance.ReadOnlySpan2D<T>.Equals(object) is not supported");
-        }
-
-        /// <inheritdoc cref="ReadOnlySpan{T}.GetHashCode()"/>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("GetHashCode() on Span will always throw an exception.")]
-        public override int GetHashCode()
-        {
-            throw new NotSupportedException("Microsoft.Toolkit.HighPerformance.ReadOnlySpan2D<T>.GetHashCode() is not supported");
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"Microsoft.Toolkit.HighPerformance.ReadOnlySpan2D<{typeof(T)}>[{Height}, {this.width}]";
-        }
-
-        /// <summary>
-        /// Checks whether two <see cref="ReadOnlySpan2D{T}"/> instances are equal.
-        /// </summary>
-        /// <param name="left">The first <see cref="ReadOnlySpan2D{T}"/> instance to compare.</param>
-        /// <param name="right">The second <see cref="ReadOnlySpan2D{T}"/> instance to compare.</param>
-        /// <returns>Whether or not <paramref name="left"/> and <paramref name="right"/> are equal.</returns>
-        public static bool operator ==(ReadOnlySpan2D<T> left, ReadOnlySpan2D<T> right)
-        {
-            return
-#if SPAN_RUNTIME_SUPPORT
-                left.span == right.span &&
-#else
-                ReferenceEquals(left.instance, right.instance) &&
-                left.offset == right.offset &&
-                left.height == right.height &&
-#endif
-                left.width == right.width &&
-                left.stride == right.stride;
-        }
-
-        /// <summary>
-        /// Checks whether two <see cref="ReadOnlySpan2D{T}"/> instances are not equal.
-        /// </summary>
-        /// <param name="left">The first <see cref="ReadOnlySpan2D{T}"/> instance to compare.</param>
-        /// <param name="right">The second <see cref="ReadOnlySpan2D{T}"/> instance to compare.</param>
-        /// <returns>Whether or not <paramref name="left"/> and <paramref name="right"/> are not equal.</returns>
-        public static bool operator !=(ReadOnlySpan2D<T> left, ReadOnlySpan2D<T> right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implicily converts a given 2D array into a <see cref="ReadOnlySpan2D{T}"/> instance.
-        /// </summary>
-        /// <param name="array">The input 2D array to convert.</param>
-        public static implicit operator ReadOnlySpan2D<T>(T[,]? array) => new(array);
-
-        /// <summary>
-        /// Implicily converts a given <see cref="Span2D{T}"/> into a <see cref="ReadOnlySpan2D{T}"/> instance.
-        /// </summary>
-        /// <param name="span">The input <see cref="Span2D{T}"/> to convert.</param>
-        public static implicit operator ReadOnlySpan2D<T>(Span2D<T> span)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            return new ReadOnlySpan2D<T>(in span.DangerousGetReference(), span.Height, span.Width, span.Stride - span.Width);
-#else
-            return new ReadOnlySpan2D<T>(span.Instance!, span.Offset, span.Height, span.Width, span.Stride - span.Width);
-#endif
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Memory/Span2D{T}.Enumerator.cs b/Microsoft.Toolkit.HighPerformance/Memory/Span2D{T}.Enumerator.cs
deleted file mode 100644
index ba75985720e..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Memory/Span2D{T}.Enumerator.cs
+++ /dev/null
@@ -1,201 +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;
-using Microsoft.Toolkit.HighPerformance.Enumerables;
-using Microsoft.Toolkit.HighPerformance.Memory.Internals;
-#if SPAN_RUNTIME_SUPPORT
-using System.Runtime.InteropServices;
-#else
-using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-#endif
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <inheritdoc cref="Span2D{T}"/>
-    public readonly ref partial struct Span2D<T>
-    {
-        /// <summary>
-        /// Gets an enumerable that traverses items in a specified row.
-        /// </summary>
-        /// <param name="row">The target row to enumerate within the current <see cref="Span2D{T}"/> instance.</param>
-        /// <returns>A <see cref="RefEnumerable{T}"/> with target items to enumerate.</returns>
-        /// <remarks>The returned <see cref="RefEnumerable{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RefEnumerable<T> GetRow(int row)
-        {
-            if ((uint)row >= Height)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            nint startIndex = (nint)(uint)this.Stride * (nint)(uint)row;
-            ref T r0 = ref DangerousGetReference();
-            ref T r1 = ref Unsafe.Add(ref r0, startIndex);
-
-#if SPAN_RUNTIME_SUPPORT
-            return new RefEnumerable<T>(ref r1, Width, 1);
-#else
-            IntPtr offset = RuntimeHelpers.GetObjectDataOrReferenceByteOffset(this.Instance, ref r1);
-
-            return new RefEnumerable<T>(this.Instance, offset, this.width, 1);
-#endif
-        }
-
-        /// <summary>
-        /// Gets an enumerable that traverses items in a specified column.
-        /// </summary>
-        /// <param name="column">The target column to enumerate within the current <see cref="Span2D{T}"/> instance.</param>
-        /// <returns>A <see cref="RefEnumerable{T}"/> with target items to enumerate.</returns>
-        /// <remarks>The returned <see cref="RefEnumerable{T}"/> value shouldn't be used directly: use this extension in a <see langword="foreach"/> loop.</remarks>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public RefEnumerable<T> GetColumn(int column)
-        {
-            if ((uint)column >= Width)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            ref T r0 = ref DangerousGetReference();
-            ref T r1 = ref Unsafe.Add(ref r0, (nint)(uint)column);
-
-#if SPAN_RUNTIME_SUPPORT
-            return new RefEnumerable<T>(ref r1, Height, this.Stride);
-#else
-            IntPtr offset = RuntimeHelpers.GetObjectDataOrReferenceByteOffset(this.Instance, ref r1);
-
-            return new RefEnumerable<T>(this.Instance, offset, Height, this.Stride);
-#endif
-        }
-
-        /// <summary>
-        /// Returns an enumerator for the current <see cref="Span2D{T}"/> instance.
-        /// </summary>
-        /// <returns>
-        /// An enumerator that can be used to traverse the items in the current <see cref="Span2D{T}"/> instance
-        /// </returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Enumerator GetEnumerator() => new(this);
-
-        /// <summary>
-        /// Provides an enumerator for the elements of a <see cref="Span2D{T}"/> instance.
-        /// </summary>
-        public ref struct Enumerator
-        {
-#if SPAN_RUNTIME_SUPPORT
-            /// <summary>
-            /// The <see cref="Span{T}"/> instance pointing to the first item in the target memory area.
-            /// </summary>
-            /// <remarks>Just like in <see cref="Span2D{T}"/>, the length is the height of the 2D region.</remarks>
-            private readonly Span<T> span;
-#else
-            /// <summary>
-            /// The target <see cref="object"/> instance, if present.
-            /// </summary>
-            private readonly object? instance;
-
-            /// <summary>
-            /// The initial offset within <see cref="instance"/>.
-            /// </summary>
-            private readonly IntPtr offset;
-
-            /// <summary>
-            /// The height of the specified 2D region.
-            /// </summary>
-            private readonly int height;
-#endif
-
-            /// <summary>
-            /// The width of the specified 2D region.
-            /// </summary>
-            private readonly int width;
-
-            /// <summary>
-            /// The stride of the specified 2D region.
-            /// </summary>
-            private readonly int stride;
-
-            /// <summary>
-            /// The current horizontal offset.
-            /// </summary>
-            private int x;
-
-            /// <summary>
-            /// The current vertical offset.
-            /// </summary>
-            private int y;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Enumerator"/> struct.
-            /// </summary>
-            /// <param name="span">The target <see cref="Span2D{T}"/> instance to enumerate.</param>
-            internal Enumerator(Span2D<T> span)
-            {
-#if SPAN_RUNTIME_SUPPORT
-                this.span = span.span;
-#else
-                this.instance = span.Instance;
-                this.offset = span.Offset;
-                this.height = span.height;
-#endif
-                this.width = span.width;
-                this.stride = span.Stride;
-                this.x = -1;
-                this.y = 0;
-            }
-
-            /// <summary>
-            /// Implements the duck-typed <see cref="System.Collections.IEnumerator.MoveNext"/> method.
-            /// </summary>
-            /// <returns><see langword="true"/> whether a new element is available, <see langword="false"/> otherwise</returns>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public bool MoveNext()
-            {
-                int x = this.x + 1;
-
-                // Horizontal move, within range
-                if (x < this.width)
-                {
-                    this.x = x;
-
-                    return true;
-                }
-
-                // We reached the end of a row and there is at least
-                // another row available: wrap to a new line and continue.
-                this.x = 0;
-
-#if SPAN_RUNTIME_SUPPORT
-                return ++this.y < this.span.Length;
-#else
-                return ++this.y < this.height;
-#endif
-            }
-
-            /// <summary>
-            /// Gets the duck-typed <see cref="System.Collections.Generic.IEnumerator{T}.Current"/> property.
-            /// </summary>
-            public readonly ref T Current
-            {
-                [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get
-                {
-#if SPAN_RUNTIME_SUPPORT
-                    ref T r0 = ref MemoryMarshal.GetReference(this.span);
-#else
-                    ref T r0 = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.instance, this.offset);
-#endif
-                    nint index = ((nint)(uint)this.y * (nint)(uint)this.stride) + (nint)(uint)this.x;
-
-                    return ref Unsafe.Add(ref r0, index);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Memory/Span2D{T}.cs b/Microsoft.Toolkit.HighPerformance/Memory/Span2D{T}.cs
deleted file mode 100644
index b2a426105a8..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Memory/Span2D{T}.cs
+++ /dev/null
@@ -1,1178 +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;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-#if !SPAN_RUNTIME_SUPPORT
-using Microsoft.Toolkit.HighPerformance.Helpers;
-#endif
-using Microsoft.Toolkit.HighPerformance.Memory.Internals;
-using Microsoft.Toolkit.HighPerformance.Memory.Views;
-#if !SPAN_RUNTIME_SUPPORT
-using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers;
-#endif
-
-#pragma warning disable CS0809, CA1065
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// <see cref="Span2D{T}"/> represents a 2D region of arbitrary memory. Like the <see cref="Span{T}"/> type,
-    /// it can point to either managed or native memory, or to memory allocated on the stack. It is type- and memory-safe.
-    /// One key difference with <see cref="Span{T}"/> and arrays is that the underlying buffer for a <see cref="Span2D{T}"/>
-    /// instance might not be contiguous in memory: this is supported to enable mapping arbitrary 2D regions even if they
-    /// require padding between boundaries of sequential rows. All this logic is handled internally by the <see cref="Span2D{T}"/>
-    /// type and it is transparent to the user, but note that working over discontiguous buffers has a performance impact.
-    /// </summary>
-    /// <typeparam name="T">The type of items in the current <see cref="Span2D{T}"/> instance.</typeparam>
-    [DebuggerTypeProxy(typeof(MemoryDebugView2D<>))]
-    [DebuggerDisplay("{ToString(),raw}")]
-    public readonly ref partial struct Span2D<T>
-    {
-        // Let's consider a representation of a discontiguous 2D memory
-        // region within an existing array. The data is represented in
-        // row-major order as usual, and the 'XX' grid cells represent
-        // locations that are mapped by a given Span2D<T> instance:
-        //
-        //                _____________________stride_____...
-        //  reference__  /________width_________  ________...
-        //             \/                       \/
-        // | -- | -- | |- | -- | -- | -- | -- | -- | -- | -- |_
-        // | -- | -- | XX | XX | XX | XX | XX | XX | -- | -- | |
-        // | -- | -- | XX | XX | XX | XX | XX | XX | -- | -- | |
-        // | -- | -- | XX | XX | XX | XX | XX | XX | -- | -- | |_height
-        // | -- | -- | XX | XX | XX | XX | XX | XX | -- | -- |_|
-        // | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- |
-        // | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- |
-        // ...__pitch__/
-        // ...________/
-        //
-        // The pitch is used to calculate the offset between each
-        // discontiguous row, so that any arbitrary memory locations
-        // can be used to internally represent a 2D span. This gives
-        // users much more flexibility when creating spans from data.
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// The <see cref="Span{T}"/> instance pointing to the first item in the target memory area.
-        /// </summary>
-        /// <remarks>
-        /// The <see cref="Span{T}.Length"/> field maps to the height of the 2D region.
-        /// This is done to save 4 bytes in the layout of the <see cref="Span2D{T}"/> type.
-        /// </remarks>
-        private readonly Span<T> span;
-#else
-        /// <summary>
-        /// The target <see cref="object"/> instance, if present.
-        /// </summary>
-        internal readonly object? Instance;
-
-        /// <summary>
-        /// The initial offset within <see cref="Instance"/>.
-        /// </summary>
-        internal readonly IntPtr Offset;
-
-        /// <summary>
-        /// The height of the specified 2D region.
-        /// </summary>
-        private readonly int height;
-#endif
-
-        /// <summary>
-        /// The width of the specified 2D region.
-        /// </summary>
-        private readonly int width;
-
-        /// <summary>
-        /// The stride of the specified 2D region.
-        /// </summary>
-        /// <remarks>
-        /// This combines both the width and pitch in a single value so that the indexing
-        /// logic can be simplified (no need to recompute the sum every time) and be faster.
-        /// </remarks>
-        internal readonly int Stride;
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Span2D{T}"/> struct with the specified parameters.
-        /// </summary>
-        /// <param name="value">The reference to the first <typeparamref name="T"/> item to map.</param>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map (the distance between each row).</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal Span2D(ref T value, int height, int width, int pitch)
-        {
-            this.span = MemoryMarshal.CreateSpan(ref value, height);
-            this.width = width;
-            this.Stride = width + pitch;
-        }
-#endif
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Span2D{T}"/> struct with the specified parameters.
-        /// </summary>
-        /// <param name="pointer">The pointer to the first <typeparamref name="T"/> item to map.</param>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map (the distance between each row).</param>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when one of the parameters are negative.</exception>
-        public unsafe Span2D(void* pointer, int height, int width, int pitch)
-        {
-            if (RuntimeHelpers.IsReferenceOrContainsReferences<T>())
-            {
-                ThrowHelper.ThrowArgumentExceptionForManagedType();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            OverflowHelper.EnsureIsInNativeIntRange(height, width, pitch);
-
-#if SPAN_RUNTIME_SUPPORT
-            this.span = new Span<T>(pointer, height);
-#else
-            this.Instance = null;
-            this.Offset = (IntPtr)pointer;
-            this.height = height;
-#endif
-            this.width = width;
-            this.Stride = width + pitch;
-        }
-
-#if !SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Span2D{T}"/> struct with the specified parameters.
-        /// </summary>
-        /// <param name="instance">The target <see cref="object"/> instance.</param>
-        /// <param name="offset">The initial offset within the target instance.</param>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal Span2D(object? instance, IntPtr offset, int height, int width, int pitch)
-        {
-            this.Instance = instance;
-            this.Offset = offset;
-            this.height = height;
-            this.width = width;
-            this.Stride = width + pitch;
-        }
-#endif
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Span2D{T}"/> struct.
-        /// </summary>
-        /// <param name="array">The target array to wrap.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/> or <paramref name="width"/> are invalid.
-        /// </exception>
-        /// <remarks>The total area must match the length of <paramref name="array"/>.</remarks>
-        public Span2D(T[] array, int height, int width)
-            : this(array, 0, height, width, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Span2D{T}"/> struct.
-        /// </summary>
-        /// <param name="array">The target array to wrap.</param>
-        /// <param name="offset">The initial offset within <paramref name="array"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="array"/>.
-        /// </exception>
-        public Span2D(T[] array, int offset, int height, int width, int pitch)
-        {
-            if (array.IsCovariant())
-            {
-                ThrowHelper.ThrowArrayTypeMismatchException();
-            }
-
-            if ((uint)offset > (uint)array.Length)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForOffset();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            int
-                area = OverflowHelper.ComputeInt32Area(height, width, pitch),
-                remaining = array.Length - offset;
-
-            if (area > remaining)
-            {
-                ThrowHelper.ThrowArgumentException();
-            }
-
-#if SPAN_RUNTIME_SUPPORT
-            this.span = MemoryMarshal.CreateSpan(ref array.DangerousGetReferenceAt(offset), height);
-#else
-            this.Instance = array;
-            this.Offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(offset));
-            this.height = height;
-#endif
-            this.width = width;
-            this.Stride = width + pitch;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Span2D{T}"/> struct wrapping a 2D array.
-        /// </summary>
-        /// <param name="array">The given 2D array to wrap.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        public Span2D(T[,]? array)
-        {
-            if (array is null)
-            {
-                this = default;
-
-                return;
-            }
-
-            if (array.IsCovariant())
-            {
-                ThrowHelper.ThrowArrayTypeMismatchException();
-            }
-
-#if SPAN_RUNTIME_SUPPORT
-            this.span = MemoryMarshal.CreateSpan(ref array.DangerousGetReference(), array.GetLength(0));
-#else
-            this.Instance = array;
-            this.Offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(0, 0));
-            this.height = array.GetLength(0);
-#endif
-            this.width = this.Stride = array.GetLength(1);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Span2D{T}"/> struct wrapping a 2D array.
-        /// </summary>
-        /// <param name="array">The given 2D array to wrap.</param>
-        /// <param name="row">The target row to map within <paramref name="array"/>.</param>
-        /// <param name="column">The target column to map within <paramref name="array"/>.</param>
-        /// <param name="height">The height to map within <paramref name="array"/>.</param>
-        /// <param name="width">The width to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when either <paramref name="height"/>, <paramref name="width"/> or <paramref name="height"/>
-        /// are negative or not within the bounds that are valid for <paramref name="array"/>.
-        /// </exception>
-        public Span2D(T[,]? array, int row, int column, int height, int width)
-        {
-            if (array is null)
-            {
-                if (row != 0 || column != 0 || height != 0 || width != 0)
-                {
-                    ThrowHelper.ThrowArgumentException();
-                }
-
-                this = default;
-
-                return;
-            }
-
-            if (array.IsCovariant())
-            {
-                ThrowHelper.ThrowArrayTypeMismatchException();
-            }
-
-            int
-                rows = array.GetLength(0),
-                columns = array.GetLength(1);
-
-            if ((uint)row >= (uint)rows)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            if ((uint)column >= (uint)columns)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            if ((uint)height > (uint)(rows - row))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if ((uint)width > (uint)(columns - column))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-#if SPAN_RUNTIME_SUPPORT
-            this.span = MemoryMarshal.CreateSpan(ref array.DangerousGetReferenceAt(row, column), height);
-#else
-            this.Instance = array;
-            this.Offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(row, column));
-            this.height = height;
-#endif
-            this.width = width;
-            this.Stride = columns;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Span2D{T}"/> struct wrapping a layer in a 3D array.
-        /// </summary>
-        /// <param name="array">The given 3D array to wrap.</param>
-        /// <param name="depth">The target layer to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when a parameter is invalid.</exception>
-        public Span2D(T[,,] array, int depth)
-        {
-            if (array.IsCovariant())
-            {
-                ThrowHelper.ThrowArrayTypeMismatchException();
-            }
-
-            if ((uint)depth >= (uint)array.GetLength(0))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForDepth();
-            }
-
-#if SPAN_RUNTIME_SUPPORT
-            this.span = MemoryMarshal.CreateSpan(ref array.DangerousGetReferenceAt(depth, 0, 0), array.GetLength(1));
-#else
-            this.Instance = array;
-            this.Offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(depth, 0, 0));
-            this.height = array.GetLength(1);
-#endif
-            this.width = this.Stride = array.GetLength(2);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Span2D{T}"/> struct wrapping a layer in a 3D array.
-        /// </summary>
-        /// <param name="array">The given 3D array to wrap.</param>
-        /// <param name="depth">The target layer to map within <paramref name="array"/>.</param>
-        /// <param name="row">The target row to map within <paramref name="array"/>.</param>
-        /// <param name="column">The target column to map within <paramref name="array"/>.</param>
-        /// <param name="height">The height to map within <paramref name="array"/>.</param>
-        /// <param name="width">The width to map within <paramref name="array"/>.</param>
-        /// <exception cref="ArrayTypeMismatchException">
-        /// Thrown when <paramref name="array"/> doesn't match <typeparamref name="T"/>.
-        /// </exception>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when a parameter is invalid.</exception>
-        public Span2D(T[,,] array, int depth, int row, int column, int height, int width)
-        {
-            if (array.IsCovariant())
-            {
-                ThrowHelper.ThrowArrayTypeMismatchException();
-            }
-
-            if ((uint)depth >= (uint)array.GetLength(0))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForDepth();
-            }
-
-            int
-                rows = array.GetLength(1),
-                columns = array.GetLength(2);
-
-            if ((uint)row >= (uint)rows)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            if ((uint)column >= (uint)columns)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            if ((uint)height > (uint)(rows - row))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if ((uint)width > (uint)(columns - column))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-#if SPAN_RUNTIME_SUPPORT
-            this.span = MemoryMarshal.CreateSpan(ref array.DangerousGetReferenceAt(depth, row, column), height);
-#else
-            this.Instance = array;
-            this.Offset = ObjectMarshal.DangerousGetObjectDataByteOffset(array, ref array.DangerousGetReferenceAt(depth, row, column));
-            this.height = height;
-#endif
-            this.width = width;
-            this.Stride = columns;
-        }
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Span2D{T}"/> struct.
-        /// </summary>
-        /// <param name="span">The target <see cref="Span{T}"/> to wrap.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/> or <paramref name="width"/> are invalid.
-        /// </exception>
-        /// <remarks>The total area must match the length of <paramref name="span"/>.</remarks>
-        internal Span2D(Span<T> span, int height, int width)
-            : this(span, 0, height, width, 0)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Span2D{T}"/> struct.
-        /// </summary>
-        /// <param name="span">The target <see cref="Span{T}"/> to wrap.</param>
-        /// <param name="offset">The initial offset within <paramref name="span"/>.</param>
-        /// <param name="height">The height of the resulting 2D area.</param>
-        /// <param name="width">The width of each row in the resulting 2D area.</param>
-        /// <param name="pitch">The pitch in the resulting 2D area.</param>
-        /// <exception cref="ArgumentOutOfRangeException">
-        /// Thrown when one of the input parameters is out of range.
-        /// </exception>
-        /// <exception cref="ArgumentException">
-        /// Thrown when the requested area is outside of bounds for <paramref name="span"/>.
-        /// </exception>
-        internal Span2D(Span<T> span, int offset, int height, int width, int pitch)
-        {
-            if ((uint)offset > (uint)span.Length)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForOffset();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            if (width == 0 || height == 0)
-            {
-                this = default;
-
-                return;
-            }
-
-            int
-                area = OverflowHelper.ComputeInt32Area(height, width, pitch),
-                remaining = span.Length - offset;
-
-            if (area > remaining)
-            {
-                ThrowHelper.ThrowArgumentException();
-            }
-
-            this.span = MemoryMarshal.CreateSpan(ref span.DangerousGetReferenceAt(offset), height);
-            this.width = width;
-            this.Stride = width + pitch;
-        }
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="Span2D{T}"/> struct with the specified parameters.
-        /// </summary>
-        /// <param name="value">The reference to the first <typeparamref name="T"/> item to map.</param>
-        /// <param name="height">The height of the 2D memory area to map.</param>
-        /// <param name="width">The width of the 2D memory area to map.</param>
-        /// <param name="pitch">The pitch of the 2D memory area to map (the distance between each row).</param>
-        /// <returns>A <see cref="Span2D{T}"/> instance with the specified parameters.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown when one of the parameters are negative.</exception>
-        [Pure]
-        public static Span2D<T> DangerousCreate(ref T value, int height, int width, int pitch)
-        {
-            if (width < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            if (height < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if (pitch < 0)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForPitch();
-            }
-
-            OverflowHelper.EnsureIsInNativeIntRange(height, width, pitch);
-
-            return new Span2D<T>(ref value, height, width, pitch);
-        }
-#endif
-
-        /// <summary>
-        /// Gets an empty <see cref="Span2D{T}"/> instance.
-        /// </summary>
-        public static Span2D<T> Empty => default;
-
-        /// <summary>
-        /// Gets a value indicating whether the current <see cref="Span2D{T}"/> instance is empty.
-        /// </summary>
-        public bool IsEmpty
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => Height == 0 || this.width == 0;
-        }
-
-        /// <summary>
-        /// Gets the length of the current <see cref="Span2D{T}"/> instance.
-        /// </summary>
-        public nint Length
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => (nint)(uint)Height * (nint)(uint)this.width;
-        }
-
-        /// <summary>
-        /// Gets the height of the underlying 2D memory area.
-        /// </summary>
-        public int Height
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-#if SPAN_RUNTIME_SUPPORT
-                return this.span.Length;
-#else
-                return this.height;
-#endif
-            }
-        }
-
-        /// <summary>
-        /// Gets the width of the underlying 2D memory area.
-        /// </summary>
-        public int Width
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.width;
-        }
-
-        /// <summary>
-        /// Gets the element at the specified zero-based indices.
-        /// </summary>
-        /// <param name="row">The target row to get the element from.</param>
-        /// <param name="column">The target column to get the element from.</param>
-        /// <returns>A reference to the element at the specified indices.</returns>
-        /// <exception cref="IndexOutOfRangeException">
-        /// Thrown when either <paramref name="row"/> or <paramref name="column"/> are invalid.
-        /// </exception>
-        public ref T this[int row, int column]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                if ((uint)row >= (uint)Height ||
-                    (uint)column >= (uint)this.width)
-                {
-                    ThrowHelper.ThrowIndexOutOfRangeException();
-                }
-
-                return ref DangerousGetReferenceAt(row, column);
-            }
-        }
-
-#if NETSTANDARD2_1_OR_GREATER
-        /// <summary>
-        /// Gets the element at the specified zero-based indices.
-        /// </summary>
-        /// <param name="row">The target row to get the element from.</param>
-        /// <param name="column">The target column to get the element from.</param>
-        /// <returns>A reference to the element at the specified indices.</returns>
-        /// <exception cref="IndexOutOfRangeException">
-        /// Thrown when either <paramref name="row"/> or <paramref name="column"/> are invalid.
-        /// </exception>
-        public ref T this[Index row, Index column]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => ref this[row.GetOffset(Height), column.GetOffset(this.width)];
-        }
-
-        /// <summary>
-        /// Slices the current instance with the specified parameters.
-        /// </summary>
-        /// <param name="rows">The target range of rows to select.</param>
-        /// <param name="columns">The target range of columns to select.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="rows"/> or <paramref name="columns"/> are invalid.
-        /// </exception>
-        /// <returns>A new <see cref="Span2D{T}"/> instance representing a slice of the current one.</returns>
-        public Span2D<T> this[Range rows, Range columns]
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                var (row, height) = rows.GetOffsetAndLength(Height);
-                var (column, width) = columns.GetOffsetAndLength(this.width);
-
-                return Slice(row, column, height, width);
-            }
-        }
-#endif
-
-        /// <summary>
-        /// Clears the contents of the current <see cref="Span2D{T}"/> instance.
-        /// </summary>
-        public void Clear()
-        {
-            if (IsEmpty)
-            {
-                return;
-            }
-
-            if (TryGetSpan(out Span<T> span))
-            {
-                span.Clear();
-            }
-            else
-            {
-                // Clear one row at a time
-#if SPAN_RUNTIME_SUPPORT
-                for (int i = 0; i < Height; i++)
-                {
-                    GetRowSpan(i).Clear();
-                }
-#else
-                int height = Height;
-                nint width = (nint)(uint)this.width;
-
-                for (int i = 0; i < height; i++)
-                {
-                    ref T rStart = ref DangerousGetReferenceAt(i, 0);
-                    ref T rEnd = ref Unsafe.Add(ref rStart, width);
-
-                    while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
-                    {
-                        rStart = default!;
-
-                        rStart = ref Unsafe.Add(ref rStart, 1);
-                    }
-                }
-#endif
-            }
-        }
-
-        /// <summary>
-        /// Copies the contents of this <see cref="Span2D{T}"/> into a destination <see cref="Span{T}"/> instance.
-        /// </summary>
-        /// <param name="destination">The destination <see cref="Span{T}"/> instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="destination" /> is shorter than the source <see cref="Span2D{T}"/> instance.
-        /// </exception>
-        public void CopyTo(Span<T> destination)
-        {
-            if (IsEmpty)
-            {
-                return;
-            }
-
-            if (TryGetSpan(out Span<T> span))
-            {
-                span.CopyTo(destination);
-            }
-            else
-            {
-                if (Length > destination.Length)
-                {
-                    ThrowHelper.ThrowArgumentExceptionForDestinationTooShort();
-                }
-
-                // Copy each row individually
-#if SPAN_RUNTIME_SUPPORT
-                for (int i = 0, j = 0; i < Height; i++, j += this.width)
-                {
-                    GetRowSpan(i).CopyTo(destination.Slice(j));
-                }
-#else
-                int height = Height;
-                nint width = (nint)(uint)this.width;
-
-                ref T destinationRef = ref MemoryMarshal.GetReference(destination);
-
-                for (int i = 0; i < height; i++)
-                {
-                    ref T sourceStart = ref DangerousGetReferenceAt(i, 0);
-                    ref T sourceEnd = ref Unsafe.Add(ref sourceStart, width);
-
-                    while (Unsafe.IsAddressLessThan(ref sourceStart, ref sourceEnd))
-                    {
-                        destinationRef = sourceStart;
-
-                        sourceStart = ref Unsafe.Add(ref sourceStart, 1);
-                        destinationRef = ref Unsafe.Add(ref destinationRef, 1);
-                    }
-                }
-#endif
-            }
-        }
-
-        /// <summary>
-        /// Copies the contents of this <see cref="Span2D{T}"/> into a destination <see cref="Span2D{T}"/> instance.
-        /// For this API to succeed, the target <see cref="Span2D{T}"/> has to have the same shape as the current one.
-        /// </summary>
-        /// <param name="destination">The destination <see cref="Span2D{T}"/> instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="destination" /> does not have the same shape as the source <see cref="Span2D{T}"/> instance.
-        /// </exception>
-        public void CopyTo(Span2D<T> destination)
-        {
-            if (destination.Height != Height ||
-                destination.width != this.width)
-            {
-                ThrowHelper.ThrowArgumentExceptionForDestinationWithNotSameShape();
-            }
-
-            if (IsEmpty)
-            {
-                return;
-            }
-
-            if (destination.TryGetSpan(out Span<T> span))
-            {
-                CopyTo(span);
-            }
-            else
-            {
-                // Copy each row individually
-#if SPAN_RUNTIME_SUPPORT
-                for (int i = 0; i < Height; i++)
-                {
-                    GetRowSpan(i).CopyTo(destination.GetRowSpan(i));
-                }
-#else
-                int height = Height;
-                nint width = (nint)(uint)this.width;
-
-                for (int i = 0; i < height; i++)
-                {
-                    ref T sourceStart = ref DangerousGetReferenceAt(i, 0);
-                    ref T sourceEnd = ref Unsafe.Add(ref sourceStart, width);
-                    ref T destinationRef = ref destination.DangerousGetReferenceAt(i, 0);
-
-                    while (Unsafe.IsAddressLessThan(ref sourceStart, ref sourceEnd))
-                    {
-                        destinationRef = sourceStart;
-
-                        sourceStart = ref Unsafe.Add(ref sourceStart, 1);
-                        destinationRef = ref Unsafe.Add(ref destinationRef, 1);
-                    }
-                }
-#endif
-            }
-        }
-
-        /// <summary>
-        /// Attempts to copy the current <see cref="Span2D{T}"/> instance to a destination <see cref="Span{T}"/>.
-        /// </summary>
-        /// <param name="destination">The target <see cref="Span{T}"/> of the copy operation.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        public bool TryCopyTo(Span<T> destination)
-        {
-            if (destination.Length >= Length)
-            {
-                CopyTo(destination);
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Attempts to copy the current <see cref="Span2D{T}"/> instance to a destination <see cref="Span2D{T}"/>.
-        /// </summary>
-        /// <param name="destination">The target <see cref="Span2D{T}"/> of the copy operation.</param>
-        /// <returns>Whether or not the operation was successful.</returns>
-        public bool TryCopyTo(Span2D<T> destination)
-        {
-            if (destination.Height == Height &&
-                destination.Width == this.width)
-            {
-                CopyTo(destination);
-
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Fills the elements of this span with a specified value.
-        /// </summary>
-        /// <param name="value">The value to assign to each element of the <see cref="Span2D{T}"/> instance.</param>
-        public void Fill(T value)
-        {
-            if (IsEmpty)
-            {
-                return;
-            }
-
-            if (TryGetSpan(out Span<T> span))
-            {
-                span.Fill(value);
-            }
-            else
-            {
-                // Fill one row at a time
-#if SPAN_RUNTIME_SUPPORT
-                for (int i = 0; i < Height; i++)
-                {
-                    GetRowSpan(i).Fill(value);
-                }
-#else
-                int height = Height;
-                nint width = (nint)(uint)this.width;
-
-                for (int i = 0; i < height; i++)
-                {
-                    ref T rStart = ref DangerousGetReferenceAt(i, 0);
-                    ref T rEnd = ref Unsafe.Add(ref rStart, width);
-
-                    while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
-                    {
-                        rStart = value;
-
-                        rStart = ref Unsafe.Add(ref rStart, 1);
-                    }
-                }
-#endif
-            }
-        }
-
-        /// <summary>
-        /// Returns a reference to the 0th element of the <see cref="Span2D{T}"/> instance. If the current
-        /// instance is empty, returns a <see langword="null"/> reference. It can be used for pinning
-        /// and is required to support the use of span within a fixed statement.
-        /// </summary>
-        /// <returns>A reference to the 0th element, or a <see langword="null"/> reference.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public unsafe ref T GetPinnableReference()
-        {
-            ref T r0 = ref Unsafe.AsRef<T>(null);
-
-            if (Length != 0)
-            {
-#if SPAN_RUNTIME_SUPPORT
-                r0 = ref MemoryMarshal.GetReference(this.span);
-#else
-                r0 = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.Instance, this.Offset);
-#endif
-            }
-
-            return ref r0;
-        }
-
-        /// <summary>
-        /// Returns a reference to the first element within the current instance, with no bounds check.
-        /// </summary>
-        /// <returns>A reference to the first element within the current instance.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ref T DangerousGetReference()
-        {
-#if SPAN_RUNTIME_SUPPORT
-            return ref MemoryMarshal.GetReference(this.span);
-#else
-            return ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.Instance, this.Offset);
-#endif
-        }
-
-        /// <summary>
-        /// Returns a reference to a specified element within the current instance, with no bounds check.
-        /// </summary>
-        /// <param name="i">The target row to get the element from.</param>
-        /// <param name="j">The target column to get the element from.</param>
-        /// <returns>A reference to the element at the specified indices.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ref T DangerousGetReferenceAt(int i, int j)
-        {
-#if SPAN_RUNTIME_SUPPORT
-            ref T r0 = ref MemoryMarshal.GetReference(this.span);
-#else
-            ref T r0 = ref RuntimeHelpers.GetObjectDataAtOffsetOrPointerReference<T>(this.Instance, this.Offset);
-#endif
-            nint index = ((nint)(uint)i * (nint)(uint)this.Stride) + (nint)(uint)j;
-
-            return ref Unsafe.Add(ref r0, index);
-        }
-
-        /// <summary>
-        /// Slices the current instance with the specified parameters.
-        /// </summary>
-        /// <param name="row">The target row to map within the current instance.</param>
-        /// <param name="column">The target column to map within the current instance.</param>
-        /// <param name="height">The height to map within the current instance.</param>
-        /// <param name="width">The width to map within the current instance.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when either <paramref name="height"/>, <paramref name="width"/> or <paramref name="height"/>
-        /// are negative or not within the bounds that are valid for the current instance.
-        /// </exception>
-        /// <returns>A new <see cref="Span2D{T}"/> instance representing a slice of the current one.</returns>
-        [Pure]
-        public Span2D<T> Slice(int row, int column, int height, int width)
-        {
-            if ((uint)row >= Height)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            if ((uint)column >= this.width)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForColumn();
-            }
-
-            if ((uint)height > (Height - row))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForHeight();
-            }
-
-            if ((uint)width > (this.width - column))
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForWidth();
-            }
-
-            nint shift = ((nint)(uint)this.Stride * (nint)(uint)row) + (nint)(uint)column;
-            int pitch = this.Stride - width;
-
-#if SPAN_RUNTIME_SUPPORT
-            ref T r0 = ref this.span.DangerousGetReferenceAt(shift);
-
-            return new Span2D<T>(ref r0, height, width, pitch);
-#else
-            IntPtr offset = this.Offset + (shift * (nint)(uint)Unsafe.SizeOf<T>());
-
-            return new Span2D<T>(this.Instance, offset, height, width, pitch);
-#endif
-        }
-
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// Gets a <see cref="Span{T}"/> for a specified row.
-        /// </summary>
-        /// <param name="row">The index of the target row to retrieve.</param>
-        /// <exception cref="ArgumentOutOfRangeException">Throw when <paramref name="row"/> is out of range.</exception>
-        /// <returns>The resulting row <see cref="Span{T}"/>.</returns>
-        [Pure]
-        public Span<T> GetRowSpan(int row)
-        {
-            if ((uint)row >= (uint)Height)
-            {
-                ThrowHelper.ThrowArgumentOutOfRangeExceptionForRow();
-            }
-
-            ref T r0 = ref DangerousGetReferenceAt(row, 0);
-
-            return MemoryMarshal.CreateSpan(ref r0, this.width);
-        }
-#endif
-
-        /// <summary>
-        /// Tries to get a <see cref="Span{T}"/> instance, if the underlying buffer is contiguous and small enough.
-        /// </summary>
-        /// <param name="span">The resulting <see cref="Span{T}"/>, in case of success.</param>
-        /// <returns>Whether or not <paramref name="span"/> was correctly assigned.</returns>
-        public bool TryGetSpan(out Span<T> span)
-        {
-            // We can only create a Span<T> if the buffer is contiguous
-            if (this.Stride == this.width &&
-                Length <= int.MaxValue)
-            {
-#if SPAN_RUNTIME_SUPPORT
-                span = MemoryMarshal.CreateSpan(ref MemoryMarshal.GetReference(this.span), (int)Length);
-
-                return true;
-#else
-                // An empty Span2D<T> is still valid
-                if (IsEmpty)
-                {
-                    span = default;
-
-                    return true;
-                }
-
-                // Pinned Span2D<T>
-                if (this.Instance is null)
-                {
-                    unsafe
-                    {
-                        span = new Span<T>((void*)this.Offset, (int)Length);
-                    }
-
-                    return true;
-                }
-
-                // Without Span<T> runtime support, we can only get a Span<T> from a T[] instance
-                if (this.Instance.GetType() == typeof(T[]))
-                {
-                    T[] array = Unsafe.As<T[]>(this.Instance)!;
-                    int index = array.AsSpan().IndexOf(ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(array, this.Offset));
-
-                    span = array.AsSpan(index, (int)Length);
-
-                    return true;
-                }
-#endif
-            }
-
-            span = default;
-
-            return false;
-        }
-
-        /// <summary>
-        /// Copies the contents of the current <see cref="Span2D{T}"/> instance into a new 2D array.
-        /// </summary>
-        /// <returns>A 2D array containing the data in the current <see cref="Span2D{T}"/> instance.</returns>
-        [Pure]
-        public T[,] ToArray()
-        {
-            T[,] array = new T[Height, this.width];
-
-#if SPAN_RUNTIME_SUPPORT
-            CopyTo(array.AsSpan());
-#else
-            // Skip the initialization if the array is empty
-            if (Length > 0)
-            {
-                int height = Height;
-                nint width = (nint)(uint)this.width;
-
-                ref T destinationRef = ref array.DangerousGetReference();
-
-                for (int i = 0; i < height; i++)
-                {
-                    ref T sourceStart = ref DangerousGetReferenceAt(i, 0);
-                    ref T sourceEnd = ref Unsafe.Add(ref sourceStart, width);
-
-                    while (Unsafe.IsAddressLessThan(ref sourceStart, ref sourceEnd))
-                    {
-                        destinationRef = sourceStart;
-
-                        sourceStart = ref Unsafe.Add(ref sourceStart, 1);
-                        destinationRef = ref Unsafe.Add(ref destinationRef, 1);
-                    }
-                }
-            }
-#endif
-
-            return array;
-        }
-
-        /// <inheritdoc cref="Span{T}.Equals(object)"/>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("Equals() on Span will always throw an exception. Use == instead.")]
-        public override bool Equals(object? obj)
-        {
-            throw new NotSupportedException("Microsoft.Toolkit.HighPerformance.Span2D<T>.Equals(object) is not supported");
-        }
-
-        /// <inheritdoc cref="Span{T}.GetHashCode()"/>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("GetHashCode() on Span will always throw an exception.")]
-        public override int GetHashCode()
-        {
-            throw new NotSupportedException("Microsoft.Toolkit.HighPerformance.Span2D<T>.GetHashCode() is not supported");
-        }
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            return $"Microsoft.Toolkit.HighPerformance.Span2D<{typeof(T)}>[{Height}, {this.width}]";
-        }
-
-        /// <summary>
-        /// Checks whether two <see cref="Span2D{T}"/> instances are equal.
-        /// </summary>
-        /// <param name="left">The first <see cref="Span2D{T}"/> instance to compare.</param>
-        /// <param name="right">The second <see cref="Span2D{T}"/> instance to compare.</param>
-        /// <returns>Whether or not <paramref name="left"/> and <paramref name="right"/> are equal.</returns>
-        public static bool operator ==(Span2D<T> left, Span2D<T> right)
-        {
-            return
-#if SPAN_RUNTIME_SUPPORT
-                left.span == right.span &&
-#else
-                ReferenceEquals(left.Instance, right.Instance) &&
-                left.Offset == right.Offset &&
-                left.height == right.height &&
-#endif
-                left.width == right.width &&
-                left.Stride == right.Stride;
-        }
-
-        /// <summary>
-        /// Checks whether two <see cref="Span2D{T}"/> instances are not equal.
-        /// </summary>
-        /// <param name="left">The first <see cref="Span2D{T}"/> instance to compare.</param>
-        /// <param name="right">The second <see cref="Span2D{T}"/> instance to compare.</param>
-        /// <returns>Whether or not <paramref name="left"/> and <paramref name="right"/> are not equal.</returns>
-        public static bool operator !=(Span2D<T> left, Span2D<T> right)
-        {
-            return !(left == right);
-        }
-
-        /// <summary>
-        /// Implicily converts a given 2D array into a <see cref="Span2D{T}"/> instance.
-        /// </summary>
-        /// <param name="array">The input 2D array to convert.</param>
-        public static implicit operator Span2D<T>(T[,]? array) => new(array);
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Memory/Views/MemoryDebugView2D{T}.cs b/Microsoft.Toolkit.HighPerformance/Memory/Views/MemoryDebugView2D{T}.cs
deleted file mode 100644
index 9fb6a82e1b9..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Memory/Views/MemoryDebugView2D{T}.cs
+++ /dev/null
@@ -1,57 +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.Diagnostics;
-
-namespace Microsoft.Toolkit.HighPerformance.Memory.Views
-{
-    /// <summary>
-    /// A debug proxy used to display items in a 2D layout.
-    /// </summary>
-    /// <typeparam name="T">The type of items to display.</typeparam>
-    internal sealed class MemoryDebugView2D<T>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryDebugView2D{T}"/> class with the specified parameters.
-        /// </summary>
-        /// <param name="memory">The input <see cref="Memory2D{T}"/> instance with the items to display.</param>
-        public MemoryDebugView2D(Memory2D<T> memory)
-        {
-            this.Items = memory.ToArray();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryDebugView2D{T}"/> class with the specified parameters.
-        /// </summary>
-        /// <param name="memory">The input <see cref="ReadOnlyMemory2D{T}"/> instance with the items to display.</param>
-        public MemoryDebugView2D(ReadOnlyMemory2D<T> memory)
-        {
-            this.Items = memory.ToArray();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryDebugView2D{T}"/> class with the specified parameters.
-        /// </summary>
-        /// <param name="span">The input <see cref="Span2D{T}"/> instance with the items to display.</param>
-        public MemoryDebugView2D(Span2D<T> span)
-        {
-            this.Items = span.ToArray();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MemoryDebugView2D{T}"/> class with the specified parameters.
-        /// </summary>
-        /// <param name="span">The input <see cref="ReadOnlySpan2D{T}"/> instance with the items to display.</param>
-        public MemoryDebugView2D(ReadOnlySpan2D<T> span)
-        {
-            this.Items = span.ToArray();
-        }
-
-        /// <summary>
-        /// Gets the items to display for the current instance
-        /// </summary>
-        [DebuggerBrowsable(DebuggerBrowsableState.Collapsed)]
-        public T[,]? Items { get; }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj
deleted file mode 100644
index 1e8597bc417..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj
+++ /dev/null
@@ -1,118 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Nullable>Enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>netstandard1.4;netstandard2.0;netstandard2.1;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <Title>Windows Community Toolkit - High Performance (.NET Standard)</Title>
-    <Description>
-      This package includes high performance .NET Standard helpers such as:
-      - Memory2D&lt;T&gt; and Span2D&lt;T&gt;: two types providing fast and allocation-free abstraction over 2D memory areas.
-      - ArrayPoolBufferWriter&lt;T&gt;: an IBufferWriter&lt;T&gt; implementation using pooled arrays, which also supports IMemoryOwner&lt;T&gt;.
-      - 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, Memory&lt;T&gt;, Span&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.
-      - ParallelHelper: helpers to work with parallel code in a highly optimized manner.
-      - Box&lt;T&gt;: a type mapping boxed value types and exposing some utility and high performance methods.
-      - Ref&lt;T&gt;: a stack-only struct that can store a reference to a value of a specified type.
-      - NullableRef&lt;T&gt;: a stack-only struct similar to Ref&lt;T&gt;, which also supports nullable references.
-  </Description>
-    <PackageTags>Parallel;Performance;Unsafe;Span;Memory;String;StringPool;Array;Stream;Buffer;Extensions;Helpers</PackageTags>
-  </PropertyGroup>
-
-  <Choose>
-    <When Condition="'$(TargetFramework)' == 'netstandard1.4'">
-      <!--
-          .NET Standard 1.4 lacks the [Pure] attribute, the Rectangle primitive,
-          the Span<T> and Memory<T> types, the Vector<T> primitive and related APIs,
-          ValueTask and ValueTask<T>, the Parallel class and the Unsafe class.
-          We also need to reference the System.Runtime.CompilerServices.Unsafe package directly,
-          even though System.Memory references it already, as we need a more recent version than
-          the one bundled with it. This is so that we can use the Unsafe.Unbox<T> method,
-          which is used by the Box<T> type in the package.
-      -->
-      <ItemGroup>
-        <PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
-        <PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
-        <PackageReference Include="System.Memory" Version="4.5.4" />
-        <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-        <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-        <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
-        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
-      </ItemGroup>
-    </When>
-
-    <When Condition="'$(TargetFramework)' == 'netstandard2.0'">
-      <!-- .NET Standard 2.0 doesn't have the Span<T>, HashCode and ValueTask types -->
-      <ItemGroup>
-        <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.0" />
-        <PackageReference Include="System.Memory" Version="4.5.4" />
-        <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
-      </ItemGroup>
-    </When>
-
-    <When Condition="'$(TargetFramework)' == 'netstandard2.1'">
-      <!--
-          NETSTANDARD2_1_OR_GREATER: includes both .NET Standard 2.1 and .NET Core 3.1.
-          This is needed because .NET Core 3.1 will be a separate package than .NET Standard 2.1.
-
-          SPAN_RUNTIME_SUPPORT: define a constant to indicate runtimes with runtime support for
-          the fast Span<T> type, as well as some overloads with Span<T> parameters (eg. Stream.Write).
-          In particular, these are runtimes which are able to create Span<T> instances from just
-          a managed reference, which can be used to slice arbitrary objects not technically supported.
-          This API (MemoryMarshal.CreateSpan) is not part of .NET Standard 2.0, but it is still
-          available on .NET Core 2.1. So by using this constant, we can make sure to expose those
-          APIs relying on that method on all target frameworks that are able to support them.
-      -->
-      <PropertyGroup>
-        <DefineConstants>NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT</DefineConstants>
-      </PropertyGroup>
-      <!-- .NET Standard 2.1 doesn't have the Unsafe type -->
-      <ItemGroup>
-        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
-      </ItemGroup>
-    </When>
-
-    <When Condition="'$(TargetFramework)' == 'net5.0'">
-      <PropertyGroup>
-        <DefineConstants>NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT</DefineConstants>
-      </PropertyGroup>
-    </When>
-
-    <When Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-      <!--
-          NETCORE_RUNTIME: to avoid issues with APIs that assume a specific memory layout, we define a
-          .NET Core runtime constant to indicate 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,
-          and ND 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
-          actually used by the consumers. .NET 5.0 would fall into this category as well, but we don't
-          need to include that target as it offers APIs that don't require runtime-based workarounds.
-      -->
-      <PropertyGroup>
-        <DefineConstants>NETSTANDARD2_1_OR_GREATER;SPAN_RUNTIME_SUPPORT;NETCORE_RUNTIME</DefineConstants>
-      </PropertyGroup>
-      <ItemGroup>
-        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
-      </ItemGroup>
-    </When>
-
-    <When Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-      <PropertyGroup>
-        <DefineConstants>SPAN_RUNTIME_SUPPORT;NETCORE_RUNTIME</DefineConstants>
-      </PropertyGroup>
-      <ItemGroup>
-        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
-      </ItemGroup>
-    </When>
-  </Choose>
-
-</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/NullableReadOnlyRef{T}.cs b/Microsoft.Toolkit.HighPerformance/NullableReadOnlyRef{T}.cs
deleted file mode 100644
index 623b14753aa..00000000000
--- a/Microsoft.Toolkit.HighPerformance/NullableReadOnlyRef{T}.cs
+++ /dev/null
@@ -1,139 +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.
-
-#if SPAN_RUNTIME_SUPPORT
-
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// A <see langword="struct"/> that can store an optional readonly reference to a value of a specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of value to reference.</typeparam>
-    public readonly ref struct NullableReadOnlyRef<T>
-    {
-        /// <summary>
-        /// The 1-length <see cref="ReadOnlySpan{T}"/> instance used to track the target <typeparamref name="T"/> value.
-        /// </summary>
-        private readonly ReadOnlySpan<T> span;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NullableReadOnlyRef{T}"/> struct.
-        /// </summary>
-        /// <param name="value">The readonly reference to the target <typeparamref name="T"/> value.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public NullableReadOnlyRef(in T value)
-        {
-            ref T r0 = ref Unsafe.AsRef(value);
-
-            this.span = MemoryMarshal.CreateReadOnlySpan(ref r0, 1);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NullableReadOnlyRef{T}"/> struct.
-        /// </summary>
-        /// <param name="span">The <see cref="ReadOnlySpan{T}"/> instance to track the target <typeparamref name="T"/> reference.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private NullableReadOnlyRef(ReadOnlySpan<T> span)
-        {
-            this.span = span;
-        }
-
-        /// <summary>
-        /// Gets a <see cref="NullableReadOnlyRef{T}"/> instance representing a <see langword="null"/> reference.
-        /// </summary>
-        public static NullableReadOnlyRef<T> Null
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => default;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether or not the current <see cref="NullableReadOnlyRef{T}"/> instance wraps a valid reference that can be accessed.
-        /// </summary>
-        public unsafe bool HasValue
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                // See comment in NullableRef<T> about this
-                byte length = unchecked((byte)this.span.Length);
-
-                return *(bool*)&length;
-            }
-        }
-
-        /// <summary>
-        /// Gets the <typeparamref name="T"/> reference represented by the current <see cref="NullableReadOnlyRef{T}"/> instance.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">Thrown if <see cref="HasValue"/> is <see langword="false"/>.</exception>
-        public ref readonly T Value
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                if (!HasValue)
-                {
-                    ThrowInvalidOperationException();
-                }
-
-                return ref MemoryMarshal.GetReference(this.span);
-            }
-        }
-
-        /// <summary>
-        /// Implicitly converts a <see cref="Ref{T}"/> instance into a <see cref="NullableReadOnlyRef{T}"/> one.
-        /// </summary>
-        /// <param name="reference">The input <see cref="Ref{T}"/> instance.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator NullableReadOnlyRef<T>(Ref<T> reference)
-        {
-            return new(reference.Span);
-        }
-
-        /// <summary>
-        /// Implicitly converts a <see cref="ReadOnlyRef{T}"/> instance into a <see cref="NullableReadOnlyRef{T}"/> one.
-        /// </summary>
-        /// <param name="reference">The input <see cref="ReadOnlyRef{T}"/> instance.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator NullableReadOnlyRef<T>(ReadOnlyRef<T> reference)
-        {
-            return new(reference.Span);
-        }
-
-        /// <summary>
-        /// Implicitly converts a <see cref="NullableRef{T}"/> instance into a <see cref="NullableReadOnlyRef{T}"/> one.
-        /// </summary>
-        /// <param name="reference">The input <see cref="Ref{T}"/> instance.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator NullableReadOnlyRef<T>(NullableRef<T> reference)
-        {
-            return new(reference.Span);
-        }
-
-        /// <summary>
-        /// Explicitly gets the <typeparamref name="T"/> value from a given <see cref="NullableReadOnlyRef{T}"/> instance.
-        /// </summary>
-        /// <param name="reference">The input <see cref="NullableReadOnlyRef{T}"/> instance.</param>
-        /// <exception cref="InvalidOperationException">Thrown if <see cref="HasValue"/> is <see langword="false"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static explicit operator T(NullableReadOnlyRef<T> reference)
-        {
-            return reference.Value;
-        }
-
-        /// <summary>
-        /// Throws a <see cref="InvalidOperationException"/> when trying to access <see cref="Value"/> for a default instance.
-        /// </summary>
-        private static void ThrowInvalidOperationException()
-        {
-            throw new InvalidOperationException("The current instance doesn't have a value that can be accessed");
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/NullableRef{T}.cs b/Microsoft.Toolkit.HighPerformance/NullableRef{T}.cs
deleted file mode 100644
index 4e3443fe780..00000000000
--- a/Microsoft.Toolkit.HighPerformance/NullableRef{T}.cs
+++ /dev/null
@@ -1,123 +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.
-
-#if SPAN_RUNTIME_SUPPORT
-
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// A <see langword="struct"/> that can store an optional reference to a value of a specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of value to reference.</typeparam>
-    public readonly ref struct NullableRef<T>
-    {
-        /// <summary>
-        /// The 1-length <see cref="Span{T}"/> instance used to track the target <typeparamref name="T"/> value.
-        /// </summary>
-        internal readonly Span<T> Span;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NullableRef{T}"/> struct.
-        /// </summary>
-        /// <param name="value">The reference to the target <typeparamref name="T"/> value.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public NullableRef(ref T value)
-        {
-            Span = MemoryMarshal.CreateSpan(ref value, 1);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NullableRef{T}"/> struct.
-        /// </summary>
-        /// <param name="span">The <see cref="Span{T}"/> instance to track the target <typeparamref name="T"/> reference.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private NullableRef(Span<T> span)
-        {
-            Span = span;
-        }
-
-        /// <summary>
-        /// Gets a <see cref="NullableRef{T}"/> instance representing a <see langword="null"/> reference.
-        /// </summary>
-        public static NullableRef<T> Null
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => default;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether or not the current <see cref="NullableRef{T}"/> instance wraps a valid reference that can be accessed.
-        /// </summary>
-        public unsafe bool HasValue
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                // We know that the span will always have a length of either
-                // 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),
-                // and then reinterpret that value to a bool flag.
-                // This results in a single movzx instruction on x86-64.
-                byte length = unchecked((byte)Span.Length);
-
-                return *(bool*)&length;
-            }
-        }
-
-        /// <summary>
-        /// Gets the <typeparamref name="T"/> reference represented by the current <see cref="NullableRef{T}"/> instance.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">Thrown if <see cref="HasValue"/> is <see langword="false"/>.</exception>
-        public ref T Value
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get
-            {
-                if (!HasValue)
-                {
-                    ThrowInvalidOperationException();
-                }
-
-                return ref MemoryMarshal.GetReference(Span);
-            }
-        }
-
-        /// <summary>
-        /// Implicitly converts a <see cref="Ref{T}"/> instance into a <see cref="NullableRef{T}"/> one.
-        /// </summary>
-        /// <param name="reference">The input <see cref="Ref{T}"/> instance.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator NullableRef<T>(Ref<T> reference)
-        {
-            return new(reference.Span);
-        }
-
-        /// <summary>
-        /// Explicitly gets the <typeparamref name="T"/> value from a given <see cref="NullableRef{T}"/> instance.
-        /// </summary>
-        /// <param name="reference">The input <see cref="NullableRef{T}"/> instance.</param>
-        /// <exception cref="InvalidOperationException">Thrown if <see cref="HasValue"/> is <see langword="false"/>.</exception>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static explicit operator T(NullableRef<T> reference)
-        {
-            return reference.Value;
-        }
-
-        /// <summary>
-        /// Throws a <see cref="InvalidOperationException"/> when trying to access <see cref="Value"/> for a default instance.
-        /// </summary>
-        private static void ThrowInvalidOperationException()
-        {
-            throw new InvalidOperationException("The current instance doesn't have a value that can be accessed");
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.HighPerformance/Properties/AssemblyInfo.cs
deleted file mode 100644
index 783438d33a8..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,11 +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.Runtime.CompilerServices;
-
-// We can suppress the .init flag for local variables for the entire module.
-// This doesn't affect the correctness of methods in this assembly, as none of them
-// are relying on the JIT ensuring that all local memory is zeroed out to work. Doing
-// this can provide some minor performance benefits, depending on the workload.
-[module: SkipLocalsInit]
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/ReadOnlyRef{T}.cs b/Microsoft.Toolkit.HighPerformance/ReadOnlyRef{T}.cs
deleted file mode 100644
index 5dd65f35e43..00000000000
--- a/Microsoft.Toolkit.HighPerformance/ReadOnlyRef{T}.cs
+++ /dev/null
@@ -1,134 +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;
-#if SPAN_RUNTIME_SUPPORT
-using System.Runtime.InteropServices;
-#else
-using Microsoft.Toolkit.HighPerformance.Helpers;
-#endif
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// A <see langword="struct"/> that can store a readonly reference to a value of a specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of value to reference.</typeparam>
-    public readonly ref struct ReadOnlyRef<T>
-    {
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// The 1-length <see cref="ReadOnlySpan{T}"/> instance used to track the target <typeparamref name="T"/> value.
-        /// </summary>
-        internal readonly ReadOnlySpan<T> Span;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyRef{T}"/> struct.
-        /// </summary>
-        /// <param name="value">The readonly reference to the target <typeparamref name="T"/> value.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ReadOnlyRef(in T value)
-        {
-            ref T r0 = ref Unsafe.AsRef(value);
-
-            Span = MemoryMarshal.CreateReadOnlySpan(ref r0, 1);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyRef{T}"/> struct.
-        /// </summary>
-        /// <param name="pointer">The pointer to the target value.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public unsafe ReadOnlyRef(void* pointer)
-            : this(in Unsafe.AsRef<T>(pointer))
-        {
-        }
-
-        /// <summary>
-        /// Gets the readonly <typeparamref name="T"/> reference represented by the current <see cref="Ref{T}"/> instance.
-        /// </summary>
-        public ref readonly T Value
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => ref MemoryMarshal.GetReference(Span);
-        }
-
-        /// <summary>
-        /// Implicitly converts a <see cref="Ref{T}"/> instance into a <see cref="ReadOnlyRef{T}"/> one.
-        /// </summary>
-        /// <param name="reference">The input <see cref="Ref{T}"/> instance.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator ReadOnlyRef<T>(Ref<T> reference)
-        {
-            return new(in reference.Value);
-        }
-#else
-        /// <summary>
-        /// The owner <see cref="object"/> the current instance belongs to
-        /// </summary>
-        private readonly object owner;
-
-        /// <summary>
-        /// The target offset within <see cref="owner"/> the current instance is pointing to
-        /// </summary>
-        private readonly IntPtr offset;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyRef{T}"/> struct.
-        /// </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 responsibility of the caller to ensure it's valid.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private ReadOnlyRef(object owner, IntPtr offset)
-        {
-            this.owner = owner;
-            this.offset = offset;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyRef{T}"/> struct.
-        /// </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 responsibility of the caller to ensure it's valid.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ReadOnlyRef(object owner, in T value)
-        {
-            this.owner = owner;
-            this.offset = ObjectMarshal.DangerousGetObjectDataByteOffset(owner, ref Unsafe.AsRef(value));
-        }
-
-        /// <summary>
-        /// Gets the readonly <typeparamref name="T"/> reference represented by the current <see cref="Ref{T}"/> instance.
-        /// </summary>
-        public ref readonly T Value
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(this.owner, this.offset);
-        }
-
-        /// <summary>
-        /// Implicitly converts a <see cref="Ref{T}"/> instance into a <see cref="ReadOnlyRef{T}"/> one.
-        /// </summary>
-        /// <param name="reference">The input <see cref="Ref{T}"/> instance.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator ReadOnlyRef<T>(Ref<T> reference)
-        {
-            return new(reference.Owner, reference.Offset);
-        }
-#endif
-
-        /// <summary>
-        /// Implicitly gets the <typeparamref name="T"/> value from a given <see cref="ReadOnlyRef{T}"/> instance.
-        /// </summary>
-        /// <param name="reference">The input <see cref="ReadOnlyRef{T}"/> instance.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator T(ReadOnlyRef<T> reference)
-        {
-            return reference.Value;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Ref{T}.cs b/Microsoft.Toolkit.HighPerformance/Ref{T}.cs
deleted file mode 100644
index bdfd6102d80..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Ref{T}.cs
+++ /dev/null
@@ -1,103 +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;
-#if SPAN_RUNTIME_SUPPORT
-using System.Runtime.InteropServices;
-#else
-using Microsoft.Toolkit.HighPerformance.Helpers;
-#endif
-
-namespace Microsoft.Toolkit.HighPerformance
-{
-    /// <summary>
-    /// A <see langword="struct"/> that can store a reference to a value of a specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of value to reference.</typeparam>
-    public readonly ref struct Ref<T>
-    {
-#if SPAN_RUNTIME_SUPPORT
-        /// <summary>
-        /// The 1-length <see cref="Span{T}"/> instance used to track the target <typeparamref name="T"/> value.
-        /// </summary>
-        internal readonly Span<T> Span;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Ref{T}"/> struct.
-        /// </summary>
-        /// <param name="value">The reference to the target <typeparamref name="T"/> value.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Ref(ref T value)
-        {
-            Span = MemoryMarshal.CreateSpan(ref value, 1);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Ref{T}"/> struct.
-        /// </summary>
-        /// <param name="pointer">The pointer to the target value.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public unsafe Ref(void* pointer)
-            : this(ref Unsafe.AsRef<T>(pointer))
-        {
-        }
-
-        /// <summary>
-        /// Gets the <typeparamref name="T"/> reference represented by the current <see cref="Ref{T}"/> instance.
-        /// </summary>
-        public ref T Value
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => ref MemoryMarshal.GetReference(Span);
-        }
-#else
-        /// <summary>
-        /// The owner <see cref="object"/> the current instance belongs to
-        /// </summary>
-        internal readonly object Owner;
-
-        /// <summary>
-        /// The target offset within <see cref="Owner"/> the current instance is pointing to
-        /// </summary>
-        /// <remarks>
-        /// Using an <see cref="IntPtr"/> instead of <see cref="int"/> to avoid the int to
-        /// native int conversion in the generated asm (an extra movsxd on x64).
-        /// </remarks>
-        internal readonly IntPtr Offset;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Ref{T}"/> struct.
-        /// </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 responsibility of the caller to ensure it's valid.</remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Ref(object owner, ref T value)
-        {
-            Owner = owner;
-            Offset = ObjectMarshal.DangerousGetObjectDataByteOffset(owner, ref value);
-        }
-
-        /// <summary>
-        /// Gets the <typeparamref name="T"/> reference represented by the current <see cref="Ref{T}"/> instance.
-        /// </summary>
-        public ref T Value
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => ref ObjectMarshal.DangerousGetObjectDataReferenceAt<T>(Owner, Offset);
-        }
-#endif
-
-        /// <summary>
-        /// Implicitly gets the <typeparamref name="T"/> value from a given <see cref="Ref{T}"/> instance.
-        /// </summary>
-        /// <param name="reference">The input <see cref="Ref{T}"/> instance.</param>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static implicit operator T(Ref<T> reference)
-        {
-            return reference.Value;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/IBufferWriterStream{TWriter}.Memory.cs b/Microsoft.Toolkit.HighPerformance/Streams/IBufferWriterStream{TWriter}.Memory.cs
deleted file mode 100644
index 14c03ff0ae1..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Streams/IBufferWriterStream{TWriter}.Memory.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.
-
-#if SPAN_RUNTIME_SUPPORT
-
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.HighPerformance.Streams
-{
-    /// <inheritdoc cref="IBufferWriterStream{TWriter}"/>
-    internal sealed partial class IBufferWriterStream<TWriter>
-    {
-        /// <inheritdoc/>
-        public override void CopyTo(Stream destination, int bufferSize)
-        {
-            throw MemoryStream.GetNotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
-        {
-            throw MemoryStream.GetNotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return new ValueTask(Task.FromCanceled(cancellationToken));
-            }
-
-            try
-            {
-                Write(buffer.Span);
-
-                return default;
-            }
-            catch (OperationCanceledException e)
-            {
-                return new ValueTask(Task.FromCanceled(e.CancellationToken));
-            }
-            catch (Exception e)
-            {
-                return new ValueTask(Task.FromException(e));
-            }
-        }
-
-        /// <inheritdoc/>
-        public override int Read(Span<byte> buffer)
-        {
-            throw MemoryStream.GetNotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override void Write(ReadOnlySpan<byte> buffer)
-        {
-            MemoryStream.ValidateDisposed(this.disposed);
-
-            Span<byte> destination = this.bufferWriter.GetSpan(buffer.Length);
-
-            if (!buffer.TryCopyTo(destination))
-            {
-                MemoryStream.ThrowArgumentExceptionForEndOfStreamOnWrite();
-            }
-
-            this.bufferWriter.Advance(buffer.Length);
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/IBufferWriterStream{TWriter}.cs b/Microsoft.Toolkit.HighPerformance/Streams/IBufferWriterStream{TWriter}.cs
deleted file mode 100644
index 1d0fbdf6342..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Streams/IBufferWriterStream{TWriter}.cs
+++ /dev/null
@@ -1,173 +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.Buffers;
-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 an <see cref="IBufferWriter{T}"/> instance.
-    /// </summary>
-    /// <typeparam name="TWriter">The type of buffer writer to use.</typeparam>
-    internal sealed partial class IBufferWriterStream<TWriter> : Stream
-        where TWriter : struct, IBufferWriter<byte>
-    {
-        /// <summary>
-        /// The target <typeparamref name="TWriter"/> instance to use.
-        /// </summary>
-        private readonly TWriter bufferWriter;
-
-        /// <summary>
-        /// Indicates whether or not the current instance has been disposed
-        /// </summary>
-        private bool disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IBufferWriterStream{TWriter}"/> class.
-        /// </summary>
-        /// <param name="bufferWriter">The target <see cref="IBufferWriter{T}"/> instance to use.</param>
-        public IBufferWriterStream(TWriter bufferWriter)
-        {
-            this.bufferWriter = bufferWriter;
-        }
-
-        /// <inheritdoc/>
-        public override bool CanRead => false;
-
-        /// <inheritdoc/>
-        public override bool CanSeek => false;
-
-        /// <inheritdoc/>
-        public override bool CanWrite
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => !this.disposed;
-        }
-
-        /// <inheritdoc/>
-        public override long Length => throw MemoryStream.GetNotSupportedException();
-
-        /// <inheritdoc/>
-        public override long Position
-        {
-            get => throw MemoryStream.GetNotSupportedException();
-            set => throw MemoryStream.GetNotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken)
-        {
-            throw MemoryStream.GetNotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override void Flush()
-        {
-        }
-
-        /// <inheritdoc/>
-        public override Task FlushAsync(CancellationToken cancellationToken)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return Task.FromCanceled(cancellationToken);
-            }
-
-            return Task.CompletedTask;
-        }
-
-        /// <inheritdoc/>
-        public override Task<int> ReadAsync(byte[]? buffer, int offset, int count, CancellationToken cancellationToken)
-        {
-            throw MemoryStream.GetNotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public 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 override long Seek(long offset, SeekOrigin origin)
-        {
-            throw MemoryStream.GetNotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override void SetLength(long value)
-        {
-            throw MemoryStream.GetNotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override int Read(byte[]? buffer, int offset, int count)
-        {
-            throw MemoryStream.GetNotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override int ReadByte()
-        {
-            throw MemoryStream.GetNotSupportedException();
-        }
-
-        /// <inheritdoc/>
-        public override void Write(byte[]? buffer, int offset, int count)
-        {
-            MemoryStream.ValidateDisposed(this.disposed);
-            MemoryStream.ValidateBuffer(buffer, offset, count);
-
-            Span<byte>
-                source = buffer.AsSpan(offset, count),
-                destination = this.bufferWriter.GetSpan(count);
-
-            if (!source.TryCopyTo(destination))
-            {
-                MemoryStream.ThrowArgumentExceptionForEndOfStreamOnWrite();
-            }
-
-            this.bufferWriter.Advance(count);
-        }
-
-        /// <inheritdoc/>
-        public override void WriteByte(byte value)
-        {
-            MemoryStream.ValidateDisposed(this.disposed);
-
-            this.bufferWriter.GetSpan(1)[0] = value;
-
-            this.bufferWriter.Advance(1);
-        }
-
-        /// <inheritdoc/>
-        protected override void Dispose(bool disposing)
-        {
-            this.disposed = true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream{TSource}.cs b/Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream{TSource}.cs
deleted file mode 100644
index 55e11c683e8..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Streams/IMemoryOwnerStream{TSource}.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.
-
-using System;
-using System.Buffers;
-using System.IO;
-
-namespace Microsoft.Toolkit.HighPerformance.Streams
-{
-    /// <summary>
-    /// A <see cref="Stream"/> implementation wrapping an <see cref="IMemoryOwner{T}"/> of <see cref="byte"/> instance.
-    /// </summary>
-    /// <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="IDisposable"/> instance currently in use.
-        /// </summary>
-        private readonly IDisposable disposable;
-
-        /// <summary>
-        /// 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="disposable">The <see cref="IDisposable"/> instance currently in use.</param>
-        public IMemoryOwnerStream(TSource source, IDisposable disposable)
-            : base(source, false)
-        {
-            this.disposable = disposable;
-        }
-
-        /// <inheritdoc/>
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            this.disposable.Dispose();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs
deleted file mode 100644
index 9234e3f5c45..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.ThrowExceptions.cs
+++ /dev/null
@@ -1,97 +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.IO;
-
-namespace Microsoft.Toolkit.HighPerformance.Streams
-{
-    /// <summary>
-    /// A factory class to produce <see cref="MemoryStream{TSource}"/> instances.
-    /// </summary>
-    internal static partial class MemoryStream
-    {
-        /// <summary>
-        /// Gets a standard <see cref="NotSupportedException"/> instance for a stream.
-        /// </summary>
-        /// <returns>A <see cref="NotSupportedException"/> with the standard text.</returns>
-        public static Exception GetNotSupportedException()
-        {
-            return new NotSupportedException("The requested operation is not supported for this stream.");
-        }
-
-        /// <summary>
-        /// Throws a <see cref="NotSupportedException"/> when trying to perform a not supported operation.
-        /// </summary>
-        public static void ThrowNotSupportedException()
-        {
-            throw GetNotSupportedException();
-        }
-
-        /// <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 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>
-        private static void ThrowArgumentOutOfRangeExceptionForPosition()
-        {
-            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>
-        private static void ThrowArgumentNullExceptionForBuffer()
-        {
-            throw new ArgumentNullException("buffer", "The buffer is null.");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the input count is negative.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForOffset()
-        {
-            throw new ArgumentOutOfRangeException("offset", "Offset can't be negative.");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentOutOfRangeException"/> when the input count is negative.
-        /// </summary>
-        private static void ThrowArgumentOutOfRangeExceptionForCount()
-        {
-            throw new ArgumentOutOfRangeException("count", "Count can't be negative.");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when the sum of offset and count exceeds the length of the target buffer.
-        /// </summary>
-        private static void ThrowArgumentExceptionForLength()
-        {
-            throw new ArgumentException("The sum of offset and count can't be larger than the buffer length.", "buffer");
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ObjectDisposedException"/> when using a disposed <see cref="Stream"/> instance.
-        /// </summary>
-        private static void ThrowObjectDisposedException()
-        {
-            throw new ObjectDisposedException("source", "The current stream has already been disposed");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.Validate.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.Validate.cs
deleted file mode 100644
index 88514f696e2..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.Validate.cs
+++ /dev/null
@@ -1,83 +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.IO;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.HighPerformance.Streams
-{
-    /// <summary>
-    /// A factory class to produce <see cref="MemoryStream{TSource}"/> instances.
-    /// </summary>
-    internal static partial class MemoryStream
-    {
-        /// <summary>
-        /// Validates the <see cref="Stream.Position"/> argument (it needs to be in the [0, length]) range.
-        /// </summary>
-        /// <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)]
-        public static void ValidatePosition(long position, int length)
-        {
-            if ((ulong)position > (ulong)length)
-            {
-                ThrowArgumentOutOfRangeExceptionForPosition();
-            }
-        }
-
-        /// <summary>
-        /// Validates the <see cref="Stream.Read(byte[],int,int)"/> or <see cref="Stream.Write(byte[],int,int)"/> arguments.
-        /// </summary>
-        /// <param name="buffer">The target array.</param>
-        /// <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)]
-        public static void ValidateBuffer(byte[]? buffer, int offset, int count)
-        {
-            if (buffer is null)
-            {
-                ThrowArgumentNullExceptionForBuffer();
-            }
-
-            if (offset < 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForOffset();
-            }
-
-            if (count < 0)
-            {
-                ThrowArgumentOutOfRangeExceptionForCount();
-            }
-
-            if (offset + count > buffer!.Length)
-            {
-                ThrowArgumentExceptionForLength();
-            }
-        }
-
-        /// <summary>
-        /// Validates the <see cref="MemoryStream{TSource}.CanWrite"/> property.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ValidateCanWrite(bool canWrite)
-        {
-            if (!canWrite)
-            {
-                ThrowNotSupportedException();
-            }
-        }
-
-        /// <summary>
-        /// Validates that a given <see cref="Stream"/> instance hasn't been disposed.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void ValidateDisposed(bool disposed)
-        {
-            if (disposed)
-            {
-                ThrowObjectDisposedException();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
deleted file mode 100644
index 565871f7163..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream.cs
+++ /dev/null
@@ -1,95 +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.Buffers;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.Toolkit.HighPerformance.Streams
-{
-    /// <summary>
-    /// A factory class to produce <see cref="MemoryStream{TSource}"/> instances.
-    /// </summary>
-    internal static partial class MemoryStream
-    {
-        /// <summary>
-        /// 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.</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);
-
-                return new MemoryStream<ArrayOwner>(arraySpanSource, isReadOnly);
-            }
-
-            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 MemoryStream<MemoryManagerOwner>(memoryManagerSpanSource, isReadOnly);
-            }
-
-            return ThrowNotSupportedExceptionForInvalidMemory();
-        }
-
-        /// <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>
-        /// <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);
-
-                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, 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.");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream{TSource}.Memory.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream{TSource}.Memory.cs
deleted file mode 100644
index 845b1438d05..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream{TSource}.Memory.cs
+++ /dev/null
@@ -1,113 +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.
-
-#if SPAN_RUNTIME_SUPPORT
-
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.HighPerformance.Streams
-{
-    /// <inheritdoc cref="MemoryStream{TSource}"/>
-    internal partial class MemoryStream<TSource>
-    {
-        /// <inheritdoc/>
-        public sealed override void CopyTo(Stream destination, int bufferSize)
-        {
-            MemoryStream.ValidateDisposed(this.disposed);
-
-            Span<byte> source = this.source.Span.Slice(this.position);
-
-            this.position += source.Length;
-
-            destination.Write(source);
-        }
-
-        /// <inheritdoc/>
-        public sealed override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return new ValueTask<int>(Task.FromCanceled<int>(cancellationToken));
-            }
-
-            try
-            {
-                int result = Read(buffer.Span);
-
-                return new ValueTask<int>(result);
-            }
-            catch (OperationCanceledException e)
-            {
-                return new ValueTask<int>(Task.FromCanceled<int>(e.CancellationToken));
-            }
-            catch (Exception e)
-            {
-                return new ValueTask<int>(Task.FromException<int>(e));
-            }
-        }
-
-        /// <inheritdoc/>
-        public sealed override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default)
-        {
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return new ValueTask(Task.FromCanceled(cancellationToken));
-            }
-
-            try
-            {
-                Write(buffer.Span);
-
-                return default;
-            }
-            catch (OperationCanceledException e)
-            {
-                return new ValueTask(Task.FromCanceled(e.CancellationToken));
-            }
-            catch (Exception e)
-            {
-                return new ValueTask(Task.FromException(e));
-            }
-        }
-
-        /// <inheritdoc/>
-        public sealed override int Read(Span<byte> buffer)
-        {
-            MemoryStream.ValidateDisposed(this.disposed);
-
-            int
-                bytesAvailable = this.source.Length - this.position,
-                bytesCopied = Math.Min(bytesAvailable, buffer.Length);
-
-            Span<byte> source = this.source.Span.Slice(this.position, bytesCopied);
-
-            source.CopyTo(buffer);
-
-            this.position += bytesCopied;
-
-            return bytesCopied;
-        }
-
-        /// <inheritdoc/>
-        public sealed override void Write(ReadOnlySpan<byte> buffer)
-        {
-            MemoryStream.ValidateDisposed(this.disposed);
-            MemoryStream.ValidateCanWrite(CanWrite);
-
-            Span<byte> destination = this.source.Span.Slice(this.position);
-
-            if (!buffer.TryCopyTo(destination))
-            {
-                MemoryStream.ThrowArgumentExceptionForEndOfStreamOnWrite();
-            }
-
-            this.position += buffer.Length;
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream{TSource}.cs b/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream{TSource}.cs
deleted file mode 100644
index 48ba4f63fdc..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Streams/MemoryStream{TSource}.cs
+++ /dev/null
@@ -1,305 +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.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)
-        {
-            throw MemoryStream.GetNotSupportedException();
-        }
-
-        /// <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;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayBufferWriterOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayBufferWriterOwner.cs
deleted file mode 100644
index be0ec40b8c2..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayBufferWriterOwner.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;
-using System.Buffers;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance.Buffers;
-
-namespace Microsoft.Toolkit.HighPerformance.Streams
-{
-    /// <summary>
-    /// An <see cref="IBufferWriter{T}"/> implementation wrapping an <see cref="ArrayPoolBufferWriter{T}"/> instance.
-    /// </summary>
-    internal readonly struct ArrayBufferWriterOwner : IBufferWriter<byte>
-    {
-        /// <summary>
-        /// The wrapped <see cref="ArrayPoolBufferWriter{T}"/> array.
-        /// </summary>
-        private readonly ArrayPoolBufferWriter<byte> writer;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ArrayBufferWriterOwner"/> struct.
-        /// </summary>
-        /// <param name="writer">The wrapped <see cref="ArrayPoolBufferWriter{T}"/> instance.</param>
-        public ArrayBufferWriterOwner(ArrayPoolBufferWriter<byte> writer)
-        {
-            this.writer = writer;
-        }
-
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Advance(int count)
-        {
-            this.writer.Advance(count);
-        }
-
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Memory<byte> GetMemory(int sizeHint = 0)
-        {
-            return this.writer.GetMemory(sizeHint);
-        }
-
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Span<byte> GetSpan(int sizeHint = 0)
-        {
-            return this.writer.GetSpan(sizeHint);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
deleted file mode 100644
index 78a997a35de..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs
+++ /dev/null
@@ -1,78 +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;
-#if SPAN_RUNTIME_SUPPORT
-using System.Runtime.InteropServices;
-#endif
-
-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;
-        }
-
-        /// <summary>
-        /// Gets an empty <see cref="ArrayOwner"/> instance.
-        /// </summary>
-        public static ArrayOwner Empty
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => new(Array.Empty<byte>(), 0, 0);
-        }
-
-        /// <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
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/IBufferWriterOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/IBufferWriterOwner.cs
deleted file mode 100644
index 46f569f95e2..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/IBufferWriterOwner.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;
-using System.Buffers;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance.Buffers;
-
-namespace Microsoft.Toolkit.HighPerformance.Streams
-{
-    /// <summary>
-    /// An <see cref="IBufferWriter{T}"/> implementation wrapping an <see cref="IBufferWriter{T}"/> instance.
-    /// </summary>
-    internal readonly struct IBufferWriterOwner : IBufferWriter<byte>
-    {
-        /// <summary>
-        /// The wrapped <see cref="ArrayPoolBufferWriter{T}"/> array.
-        /// </summary>
-        private readonly IBufferWriter<byte> writer;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IBufferWriterOwner"/> struct.
-        /// </summary>
-        /// <param name="writer">The wrapped <see cref="IBufferWriter{T}"/> instance.</param>
-        public IBufferWriterOwner(IBufferWriter<byte> writer)
-        {
-            this.writer = writer;
-        }
-
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Advance(int count)
-        {
-            this.writer.Advance(count);
-        }
-
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Memory<byte> GetMemory(int sizeHint = 0)
-        {
-            return this.writer.GetMemory(sizeHint);
-        }
-
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Span<byte> GetSpan(int sizeHint = 0)
-        {
-            return this.writer.GetSpan(sizeHint);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs
deleted file mode 100644
index 6a6e20ea223..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/Interfaces/ISpanOwner.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-
-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; }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.cs
deleted file mode 100644
index 2e381d018da..00000000000
--- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/MemoryManagerOwner.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.Buffers;
-using System.Runtime.CompilerServices;
-
-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
-            {
-                // 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);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/AnalyzerReleases.Shipped.md b/Microsoft.Toolkit.Mvvm.SourceGenerators/AnalyzerReleases.Shipped.md
deleted file mode 100644
index 5ccc9f037f6..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/AnalyzerReleases.Shipped.md
+++ /dev/null
@@ -1,2 +0,0 @@
-; Shipped analyzer releases
-; https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/AnalyzerReleases.Unshipped.md b/Microsoft.Toolkit.Mvvm.SourceGenerators/AnalyzerReleases.Unshipped.md
deleted file mode 100644
index 09be8eafd5f..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/AnalyzerReleases.Unshipped.md
+++ /dev/null
@@ -1,20 +0,0 @@
-; Unshipped analyzer release
-; https://github.com/dotnet/roslyn-analyzers/blob/main/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md
-
-### New Rules
-
-Rule ID | Category | Severity | Notes
---------|----------|----------|-------
-MVVMTK0001 | Microsoft.Toolkit.Mvvm.SourceGenerators.INotifyPropertyChangedGenerator | Error | See https://aka.ms/mvvmtoolkit/error
-MVVMTK0002 | Microsoft.Toolkit.Mvvm.SourceGenerators.ObservableObjectGenerator | Error | See https://aka.ms/mvvmtoolkit/error
-MVVMTK0003 | Microsoft.Toolkit.Mvvm.SourceGenerators.ObservableRecipientGenerator | Error | See https://aka.ms/mvvmtoolkit/error
-MVVMTK0004 | Microsoft.Toolkit.Mvvm.SourceGenerators.INotifyPropertyChangedGenerator | Error | See https://aka.ms/mvvmtoolkit/error
-MVVMTK0005 | Microsoft.Toolkit.Mvvm.SourceGenerators.ObservableObjectGenerator | Error | See https://aka.ms/mvvmtoolkit/error
-MVVMTK0006 | Microsoft.Toolkit.Mvvm.SourceGenerators.ObservableObjectGenerator | Error | See https://aka.ms/mvvmtoolkit/error
-MVVMTK0007 | Microsoft.Toolkit.Mvvm.SourceGenerators.ObservableRecipientGenerator | Error | See https://aka.ms/mvvmtoolkit/error
-MVVMTK0008 | Microsoft.Toolkit.Mvvm.SourceGenerators.ObservableRecipientGenerator | Error | See https://aka.ms/mvvmtoolkit/error
-MVVMTK0009 | Microsoft.Toolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator | Error | See https://aka.ms/mvvmtoolkit/error
-MVVMTK0010 | Microsoft.Toolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator | Error | See https://aka.ms/mvvmtoolkit/error
-MVVMTK0011 | Microsoft.Toolkit.Mvvm.SourceGenerators.ObservablePropertyGenerator | Error | See https://aka.ms/mvvmtoolkit/error
-MVVMTK0012 | Microsoft.Toolkit.Mvvm.SourceGenerators.ICommandGenerator | Error | See https://aka.ms/mvvmtoolkit/error
-MVVMTK0013 | Microsoft.CodeAnalysis.CSharp.CSharpParseOptions | Error | See https://aka.ms/mvvmtoolkit/error
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Attributes/NotNullWhenAttribute.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Attributes/NotNullWhenAttribute.cs
deleted file mode 100644
index 7e63f97aae5..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Attributes/NotNullWhenAttribute.cs
+++ /dev/null
@@ -1,25 +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.CodeAnalysis
-{
-    /// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter will not be null even if the corresponding type allows it.</summary>
-    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
-    internal sealed class NotNullWhenAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotNullWhenAttribute"/> class.
-        /// </summary>
-        /// <param name="returnValue">The return value condition. If the method returns this value, the associated parameter will not be null.</param>
-        public NotNullWhenAttribute(bool returnValue)
-        {
-            ReturnValue = returnValue;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether the annotated parameter will be null depending on the return value.
-        /// </summary>
-        public bool ReturnValue { get; }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Attributes/NullabilityAttributesGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Attributes/NullabilityAttributesGenerator.cs
deleted file mode 100644
index a0c2d6ef8a2..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Attributes/NullabilityAttributesGenerator.cs
+++ /dev/null
@@ -1,60 +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.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Text;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <summary>
-    /// A source generator for necessary nullability attributes.
-    /// </summary>
-    [Generator]
-    public sealed class NullabilityAttributesGenerator : ISourceGenerator
-    {
-        /// <inheritdoc/>
-        public void Initialize(GeneratorInitializationContext context)
-        {
-        }
-
-        /// <inheritdoc/>
-        public void Execute(GeneratorExecutionContext context)
-        {
-            AddSourceCodeIfTypeIsNotPresent(context, "System.Diagnostics.CodeAnalysis.NotNullAttribute");
-            AddSourceCodeIfTypeIsNotPresent(context, "System.Diagnostics.CodeAnalysis.NotNullIfNotNullAttribute");
-        }
-
-        /// <summary>
-        /// Adds the source for a given attribute type if it's not present already in the compilation.
-        /// </summary>
-        private void AddSourceCodeIfTypeIsNotPresent(GeneratorExecutionContext context, string typeFullName)
-        {
-            // Check that the target attributes are not available in the consuming project. To ensure that
-            // this works fine both in .NET (Core) and .NET Standard implementations, we also need to check
-            // that the target types are declared as public (we assume that in this case those types are from the BCL).
-            // This avoids issues on .NET Standard with Roslyn also seeing internal types from referenced assemblies.
-            if (context.Compilation.GetTypeByMetadataName(typeFullName) is { DeclaredAccessibility: Accessibility.Public })
-            {
-                return;
-            }
-
-            string
-                typeName = typeFullName.Split('.').Last(),
-                filename = $"Microsoft.Toolkit.Mvvm.SourceGenerators.EmbeddedResources.{typeName}.cs";
-
-            Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(filename);
-            StreamReader reader = new(stream);
-
-            string
-                originalSource = reader.ReadToEnd(),
-                outputSource = originalSource.Replace("NETSTANDARD2_0", "true");
-
-            context.AddSource($"{typeFullName}.cs", SourceText.From(outputSource, Encoding.UTF8));
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/INotifyPropertyChangedGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/INotifyPropertyChangedGenerator.cs
deleted file mode 100644
index 4f4534b5818..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/INotifyPropertyChangedGenerator.cs
+++ /dev/null
@@ -1,77 +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.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions;
-using static Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics.DiagnosticDescriptors;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <summary>
-    /// A source generator for the <c>INotifyPropertyChangedAttribute</c> type.
-    /// </summary>
-    [Generator]
-    public sealed class INotifyPropertyChangedGenerator : TransitiveMembersGenerator
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="INotifyPropertyChangedGenerator"/> class.
-        /// </summary>
-        public INotifyPropertyChangedGenerator()
-            : base("Microsoft.Toolkit.Mvvm.ComponentModel.INotifyPropertyChangedAttribute")
-        {
-        }
-
-        /// <inheritdoc/>
-        protected override DiagnosticDescriptor TargetTypeErrorDescriptor => INotifyPropertyChangedGeneratorError;
-
-        /// <inheritdoc/>
-        protected override bool ValidateTargetType(
-            GeneratorExecutionContext context,
-            AttributeData attributeData,
-            ClassDeclarationSyntax classDeclaration,
-            INamedTypeSymbol classDeclarationSymbol,
-            [NotNullWhen(false)] out DiagnosticDescriptor? descriptor)
-        {
-            INamedTypeSymbol iNotifyPropertyChangedSymbol = context.Compilation.GetTypeByMetadataName("System.ComponentModel.INotifyPropertyChanged")!;
-
-            // Check if the type already implements INotifyPropertyChanged
-            if (classDeclarationSymbol.AllInterfaces.Any(i => SymbolEqualityComparer.Default.Equals(i, iNotifyPropertyChangedSymbol)))
-            {
-                descriptor = DuplicateINotifyPropertyChangedInterfaceForINotifyPropertyChangedAttributeError;
-
-                return false;
-            }
-
-            descriptor = null;
-
-            return true;
-        }
-
-        /// <inheritdoc/>
-        protected override IEnumerable<MemberDeclarationSyntax> FilterDeclaredMembers(
-            GeneratorExecutionContext context,
-            AttributeData attributeData,
-            ClassDeclarationSyntax classDeclaration,
-            INamedTypeSymbol classDeclarationSymbol,
-            ClassDeclarationSyntax sourceDeclaration)
-        {
-            // If requested, only include the event and the basic methods to raise it, but not the additional helpers
-            if (attributeData.HasNamedArgument("IncludeAdditionalHelperMethods", false))
-            {
-                return sourceDeclaration.Members.Where(static member =>
-                {
-                    return member
-                        is EventFieldDeclarationSyntax
-                        or MethodDeclarationSyntax { Identifier: { ValueText: "OnPropertyChanged" } };
-                });
-            }
-
-            return sourceDeclaration.Members;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableObjectGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableObjectGenerator.cs
deleted file mode 100644
index c1b1a37ffbc..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableObjectGenerator.cs
+++ /dev/null
@@ -1,63 +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.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using static Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics.DiagnosticDescriptors;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <summary>
-    /// A source generator for the <c>ObservableObjectAttribute</c> type.
-    /// </summary>
-    [Generator]
-    public sealed class ObservableObjectGenerator : TransitiveMembersGenerator
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableObjectGenerator"/> class.
-        /// </summary>
-        public ObservableObjectGenerator()
-            : base("Microsoft.Toolkit.Mvvm.ComponentModel.ObservableObjectAttribute")
-        {
-        }
-
-        /// <inheritdoc/>
-        protected override DiagnosticDescriptor TargetTypeErrorDescriptor => ObservableObjectGeneratorError;
-
-        /// <inheritdoc/>
-        protected override bool ValidateTargetType(
-            GeneratorExecutionContext context,
-            AttributeData attributeData,
-            ClassDeclarationSyntax classDeclaration,
-            INamedTypeSymbol classDeclarationSymbol,
-            [NotNullWhen(false)] out DiagnosticDescriptor? descriptor)
-        {
-            INamedTypeSymbol
-                iNotifyPropertyChangedSymbol = context.Compilation.GetTypeByMetadataName("System.ComponentModel.INotifyPropertyChanged")!,
-                iNotifyPropertyChangingSymbol = context.Compilation.GetTypeByMetadataName("System.ComponentModel.INotifyPropertyChanging")!;
-
-            // Check if the type already implements INotifyPropertyChanged...
-            if (classDeclarationSymbol.AllInterfaces.Any(i => SymbolEqualityComparer.Default.Equals(i, iNotifyPropertyChangedSymbol)))
-            {
-                descriptor = DuplicateINotifyPropertyChangedInterfaceForObservableObjectAttributeError;
-
-                return false;
-            }
-
-            // ...or INotifyPropertyChanging
-            if (classDeclarationSymbol.AllInterfaces.Any(i => SymbolEqualityComparer.Default.Equals(i, iNotifyPropertyChangingSymbol)))
-            {
-                descriptor = DuplicateINotifyPropertyChangingInterfaceForObservableObjectAttributeError;
-
-                return false;
-            }
-
-            descriptor = null;
-
-            return true;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.SyntaxReceiver.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.SyntaxReceiver.cs
deleted file mode 100644
index f71dfa367ac..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.SyntaxReceiver.cs
+++ /dev/null
@@ -1,58 +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.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <inheritdoc cref="ObservablePropertyGenerator"/>
-    public sealed partial class ObservablePropertyGenerator
-    {
-        /// <summary>
-        /// An <see cref="ISyntaxContextReceiver"/> that selects candidate nodes to process.
-        /// </summary>
-        private sealed class SyntaxReceiver : ISyntaxContextReceiver
-        {
-            /// <summary>
-            /// The list of info gathered during exploration.
-            /// </summary>
-            private readonly List<Item> gatheredInfo = new();
-
-            /// <summary>
-            /// Gets the collection of gathered info to process.
-            /// </summary>
-            public IReadOnlyCollection<Item> GatheredInfo => this.gatheredInfo;
-
-            /// <inheritdoc/>
-            public void OnVisitSyntaxNode(GeneratorSyntaxContext context)
-            {
-                if (context.Node is FieldDeclarationSyntax { AttributeLists: { Count: > 0 } } fieldDeclaration &&
-                    context.SemanticModel.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.ComponentModel.ObservablePropertyAttribute") is INamedTypeSymbol attributeSymbol)
-                {
-                    SyntaxTriviaList leadingTrivia = fieldDeclaration.GetLeadingTrivia();
-
-                    foreach (VariableDeclaratorSyntax variableDeclarator in fieldDeclaration.Declaration.Variables)
-                    {
-                        if (context.SemanticModel.GetDeclaredSymbol(variableDeclarator) is IFieldSymbol fieldSymbol &&
-                            fieldSymbol.GetAttributes().Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, attributeSymbol)))
-                        {
-                            this.gatheredInfo.Add(new Item(leadingTrivia, fieldSymbol));
-                        }
-                    }
-                }
-            }
-
-            /// <summary>
-            /// A model for a group of item representing a discovered type to process.
-            /// </summary>
-            /// <param name="LeadingTrivia">The leading trivia for the field declaration.</param>
-            /// <param name="FieldSymbol">The <see cref="IFieldSymbol"/> instance for the target field.</param>
-            public sealed record Item(SyntaxTriviaList LeadingTrivia, IFieldSymbol FieldSymbol);
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs
deleted file mode 100644
index ef3ddf5b0f0..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs
+++ /dev/null
@@ -1,590 +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.ComponentModel;
-using System.Diagnostics.Contracts;
-using System.Linq;
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics;
-using Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions;
-using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
-using static Microsoft.CodeAnalysis.SymbolDisplayTypeQualificationStyle;
-using static Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics.DiagnosticDescriptors;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <summary>
-    /// A source generator for the <c>ObservablePropertyAttribute</c> type.
-    /// </summary>
-    [Generator]
-    public sealed partial class ObservablePropertyGenerator : ISourceGenerator
-    {
-        /// <inheritdoc/>
-        public void Initialize(GeneratorInitializationContext context)
-        {
-            context.RegisterForSyntaxNotifications(static () => new SyntaxReceiver());
-        }
-
-        /// <inheritdoc/>
-        public void Execute(GeneratorExecutionContext context)
-        {
-            // Get the syntax receiver with the candidate nodes
-            if (context.SyntaxContextReceiver is not SyntaxReceiver syntaxReceiver ||
-                syntaxReceiver.GatheredInfo.Count == 0)
-            {
-                return;
-            }
-
-            // Validate the language version. Note that we're emitting this diagnostic in each generator (excluding the one
-            // only emitting the nullability annotation attributes if missing) so that the diagnostic is emitted only when
-            // users are using one of these generators, and not by default as soon as they add a reference to the MVVM Toolkit.
-            // This ensures that users not using any of the source generators won't be broken when upgrading to this new version.
-            if (context.ParseOptions is not CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp9 })
-            {
-                context.ReportDiagnostic(Diagnostic.Create(UnsupportedCSharpLanguageVersionError, null));
-            }
-
-            // Sets of discovered property names
-            HashSet<string>
-                propertyChangedNames = new(),
-                propertyChangingNames = new();
-
-            // Process the annotated fields
-            foreach (var items in syntaxReceiver.GatheredInfo.GroupBy<SyntaxReceiver.Item, INamedTypeSymbol>(static item => item.FieldSymbol.ContainingType, SymbolEqualityComparer.Default))
-            {
-                if (items.Key.DeclaringSyntaxReferences.Length > 0 &&
-                    items.Key.DeclaringSyntaxReferences.First().GetSyntax() is ClassDeclarationSyntax classDeclaration)
-                {
-                    try
-                    {
-                        OnExecuteForProperties(context, classDeclaration, items.Key, items, propertyChangedNames, propertyChangingNames);
-                    }
-                    catch
-                    {
-                        context.ReportDiagnostic(ObservablePropertyGeneratorError, items.Key, items.Key);
-                    }
-                }
-            }
-
-            // Process the fields for the cached args
-            OnExecuteForPropertyArgs(context, propertyChangedNames, propertyChangingNames);
-        }
-
-        /// <summary>
-        /// Processes a given target type for declared observable properties.
-        /// </summary>
-        /// <param name="context">The input <see cref="GeneratorExecutionContext"/> instance to use.</param>
-        /// <param name="classDeclaration">The <see cref="ClassDeclarationSyntax"/> node to process.</param>
-        /// <param name="classDeclarationSymbol">The <see cref="INamedTypeSymbol"/> for <paramref name="classDeclaration"/>.</param>
-        /// <param name="items">The sequence of fields to process.</param>
-        /// <param name="propertyChangedNames">The collection of discovered property changed names.</param>
-        /// <param name="propertyChangingNames">The collection of discovered property changing names.</param>
-        private static void OnExecuteForProperties(
-            GeneratorExecutionContext context,
-            ClassDeclarationSyntax classDeclaration,
-            INamedTypeSymbol classDeclarationSymbol,
-            IEnumerable<SyntaxReceiver.Item> items,
-            ICollection<string> propertyChangedNames,
-            ICollection<string> propertyChangingNames)
-        {
-            INamedTypeSymbol
-                iNotifyPropertyChangingSymbol = context.Compilation.GetTypeByMetadataName("System.ComponentModel.INotifyPropertyChanging")!,
-                observableObjectSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.ComponentModel.ObservableObject")!,
-                observableObjectAttributeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.ComponentModel.ObservableObjectAttribute")!,
-                observableValidatorSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.ComponentModel.ObservableValidator")!;
-
-            // Check whether the current type implements INotifyPropertyChanging and whether it inherits from ObservableValidator
-            bool
-                isObservableObject = classDeclarationSymbol.InheritsFrom(observableObjectSymbol),
-                isObservableValidator = classDeclarationSymbol.InheritsFrom(observableValidatorSymbol),
-                isNotifyPropertyChanging =
-                    isObservableObject ||
-                    classDeclarationSymbol.AllInterfaces.Contains(iNotifyPropertyChangingSymbol, SymbolEqualityComparer.Default) ||
-                    classDeclarationSymbol.GetAttributes().Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, observableObjectAttributeSymbol));
-
-            // Create the class declaration for the user type. This will produce a tree as follows:
-            //
-            // <MODIFIERS> <CLASS_NAME>
-            // {
-            //     <MEMBERS>
-            // }
-            var classDeclarationSyntax =
-                ClassDeclaration(classDeclarationSymbol.Name)
-                .WithModifiers(classDeclaration.Modifiers)
-                .AddMembers(items.Select(item =>
-                    CreatePropertyDeclaration(
-                        context,
-                        item.LeadingTrivia,
-                        item.FieldSymbol,
-                        isNotifyPropertyChanging,
-                        isObservableValidator,
-                        propertyChangedNames,
-                        propertyChangingNames)).ToArray());
-
-            TypeDeclarationSyntax typeDeclarationSyntax = classDeclarationSyntax;
-
-            // Add all parent types in ascending order, if any
-            foreach (var parentType in classDeclaration.Ancestors().OfType<TypeDeclarationSyntax>())
-            {
-                typeDeclarationSyntax = parentType
-                    .WithMembers(SingletonList<MemberDeclarationSyntax>(typeDeclarationSyntax))
-                    .WithConstraintClauses(List<TypeParameterConstraintClauseSyntax>())
-                    .WithBaseList(null)
-                    .WithAttributeLists(List<AttributeListSyntax>())
-                    .WithoutTrivia();
-            }
-
-            // Create the compilation unit with the namespace and target member.
-            // From this, we can finally generate the source code to output.
-            var namespaceName = classDeclarationSymbol.ContainingNamespace.ToDisplayString(new(typeQualificationStyle: NameAndContainingTypesAndNamespaces));
-
-            // Create the final compilation unit to generate (with leading trivia)
-            var source =
-                CompilationUnit().AddMembers(
-                NamespaceDeclaration(IdentifierName(namespaceName)).WithLeadingTrivia(TriviaList(
-                    Comment("// Licensed to the .NET Foundation under one or more agreements."),
-                    Comment("// The .NET Foundation licenses this file to you under the MIT license."),
-                    Comment("// See the LICENSE file in the project root for more information."),
-                    Trivia(PragmaWarningDirectiveTrivia(Token(SyntaxKind.DisableKeyword), true))))
-                .AddMembers(typeDeclarationSyntax))
-                .NormalizeWhitespace()
-                .ToFullString();
-
-            // Add the partial type
-            context.AddSource($"{classDeclarationSymbol.GetFullMetadataNameForFileName()}.cs", SourceText.From(source, Encoding.UTF8));
-        }
-
-        /// <summary>
-        /// Creates a <see cref="PropertyDeclarationSyntax"/> instance for a specified field.
-        /// </summary>
-        /// <param name="context">The input <see cref="GeneratorExecutionContext"/> instance to use.</param>
-        /// <param name="leadingTrivia">The leading trivia for the field to process.</param>
-        /// <param name="fieldSymbol">The input <see cref="IFieldSymbol"/> instance to process.</param>
-        /// <param name="isNotifyPropertyChanging">Indicates whether or not <see cref="INotifyPropertyChanging"/> is also implemented.</param>
-        /// <param name="isObservableValidator">Indicates whether or not the containing type inherits from <c>ObservableValidator</c>.</param>
-        /// <param name="propertyChangedNames">The collection of discovered property changed names.</param>
-        /// <param name="propertyChangingNames">The collection of discovered property changing names.</param>
-        /// <returns>A generated <see cref="PropertyDeclarationSyntax"/> instance for the input field.</returns>
-        [Pure]
-        private static PropertyDeclarationSyntax CreatePropertyDeclaration(
-            GeneratorExecutionContext context,
-            SyntaxTriviaList leadingTrivia,
-            IFieldSymbol fieldSymbol,
-            bool isNotifyPropertyChanging,
-            bool isObservableValidator,
-            ICollection<string> propertyChangedNames,
-            ICollection<string> propertyChangingNames)
-        {
-            // Get the field type and the target property name
-            string
-                typeName = fieldSymbol.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat),
-                propertyName = GetGeneratedPropertyName(fieldSymbol);
-
-            INamedTypeSymbol alsoNotifyChangeForAttributeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.ComponentModel.AlsoNotifyChangeForAttribute")!;
-            INamedTypeSymbol? validationAttributeSymbol = context.Compilation.GetTypeByMetadataName("System.ComponentModel.DataAnnotations.ValidationAttribute");
-
-            List<StatementSyntax> dependentPropertyNotificationStatements = new();
-            List<AttributeSyntax> validationAttributes = new();
-
-            foreach (AttributeData attributeData in fieldSymbol.GetAttributes())
-            {
-                // Add dependent property notifications, if needed
-                if (SymbolEqualityComparer.Default.Equals(attributeData.AttributeClass, alsoNotifyChangeForAttributeSymbol))
-                {
-                    foreach (TypedConstant attributeArgument in attributeData.ConstructorArguments)
-                    {
-                        if (attributeArgument.IsNull)
-                        {
-                            continue;
-                        }
-
-                        if (attributeArgument.Kind == TypedConstantKind.Primitive &&
-                            attributeArgument.Value is string dependentPropertyName)
-                        {
-                            propertyChangedNames.Add(dependentPropertyName);
-
-                            // OnPropertyChanged("OtherPropertyName");
-                            dependentPropertyNotificationStatements.Add(ExpressionStatement(
-                                InvocationExpression(IdentifierName("OnPropertyChanged"))
-                                .AddArgumentListArguments(Argument(MemberAccessExpression(
-                                    SyntaxKind.SimpleMemberAccessExpression,
-                                    IdentifierName("global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs"),
-                                    IdentifierName($"{dependentPropertyName}{nameof(PropertyChangedEventArgs)}"))))));
-                        }
-                        else if (attributeArgument.Kind == TypedConstantKind.Array)
-                        {
-                            foreach (TypedConstant nestedAttributeArgument in attributeArgument.Values)
-                            {
-                                if (nestedAttributeArgument.IsNull)
-                                {
-                                    continue;
-                                }
-
-                                string currentPropertyName = (string)nestedAttributeArgument.Value!;
-
-                                propertyChangedNames.Add(currentPropertyName);
-
-                                // Additional property names
-                                dependentPropertyNotificationStatements.Add(ExpressionStatement(
-                                    InvocationExpression(IdentifierName("OnPropertyChanged"))
-                                    .AddArgumentListArguments(Argument(MemberAccessExpression(
-                                        SyntaxKind.SimpleMemberAccessExpression,
-                                        IdentifierName("global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs"),
-                                        IdentifierName($"{currentPropertyName}{nameof(PropertyChangedEventArgs)}"))))));
-                            }
-                        }
-                    }
-                }
-                else if (validationAttributeSymbol is not null &&
-                         attributeData.AttributeClass?.InheritsFrom(validationAttributeSymbol) == true)
-                {
-                    // Track the current validation attribute
-                    validationAttributes.Add(attributeData.AsAttributeSyntax());
-                }
-            }
-
-            // In case the backing field is exactly named "value", we need to add the "this." prefix to ensure that comparisons and assignments
-            // with it in the generated setter body are executed correctly and without conflicts with the implicit value parameter.
-            ExpressionSyntax fieldExpression = fieldSymbol.Name switch
-            {
-                "value" => MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression, ThisExpression(), IdentifierName("value")),
-                string name => IdentifierName(name)
-            };
-
-            BlockSyntax setterBlock;
-
-            if (validationAttributes.Count > 0)
-            {
-                // Emit a diagnostic if the current type doesn't inherit from ObservableValidator
-                if (!isObservableValidator)
-                {
-                    context.ReportDiagnostic(
-                        MissingObservableValidatorInheritanceError,
-                        fieldSymbol,
-                        fieldSymbol.ContainingType,
-                        fieldSymbol.Name,
-                        validationAttributes.Count);
-
-                    setterBlock = Block();
-                }
-                else
-                {
-                    propertyChangedNames.Add(propertyName);
-                    propertyChangingNames.Add(propertyName);
-
-                    // Generate the inner setter block as follows:
-                    //
-                    // if (!global::System.Collections.Generic.EqualityComparer<<FIELD_TYPE>>.Default.Equals(this.<FIELD_NAME>, value))
-                    // {
-                    //     OnPropertyChanging(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.PropertyNamePropertyChangingEventArgs); // Optional
-                    //     this.<FIELD_NAME> = value;
-                    //     OnPropertyChanged(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.PropertyNamePropertyChangedEventArgs);
-                    //     ValidateProperty(value, <PROPERTY_NAME>);
-                    //     OnPropertyChanged(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.Property1PropertyChangedEventArgs); // Optional
-                    //     OnPropertyChanged(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.Property2PropertyChangedEventArgs);
-                    //     ...
-                    //     OnPropertyChanged(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.PropertyNPropertyChangedEventArgs);
-                    // }
-                    //
-                    // The reason why the code is explicitly generated instead of just calling ObservableValidator.SetProperty() is so that we can
-                    // take advantage of the cached property changed arguments for the current property as well, not just for the dependent ones.
-                    setterBlock = Block(
-                        IfStatement(
-                            PrefixUnaryExpression(
-                                SyntaxKind.LogicalNotExpression,
-                                InvocationExpression(
-                                    MemberAccessExpression(
-                                        SyntaxKind.SimpleMemberAccessExpression,
-                                        MemberAccessExpression(
-                                            SyntaxKind.SimpleMemberAccessExpression,
-                                            GenericName(Identifier("global::System.Collections.Generic.EqualityComparer"))
-                                            .AddTypeArgumentListArguments(IdentifierName(typeName)),
-                                            IdentifierName("Default")),
-                                        IdentifierName("Equals")))
-                                .AddArgumentListArguments(
-                                    Argument(fieldExpression),
-                                    Argument(IdentifierName("value")))),
-                            Block(
-                                ExpressionStatement(
-                                    InvocationExpression(IdentifierName("OnPropertyChanging"))
-                                    .AddArgumentListArguments(Argument(MemberAccessExpression(
-                                        SyntaxKind.SimpleMemberAccessExpression,
-                                        IdentifierName("global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs"),
-                                        IdentifierName($"{propertyName}{nameof(PropertyChangingEventArgs)}"))))),
-                                ExpressionStatement(
-                                    AssignmentExpression(
-                                        SyntaxKind.SimpleAssignmentExpression,
-                                        fieldExpression,
-                                        IdentifierName("value"))),
-                                ExpressionStatement(
-                                    InvocationExpression(IdentifierName("OnPropertyChanged"))
-                                    .AddArgumentListArguments(Argument(MemberAccessExpression(
-                                        SyntaxKind.SimpleMemberAccessExpression,
-                                        IdentifierName("global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs"),
-                                        IdentifierName($"{propertyName}{nameof(PropertyChangedEventArgs)}"))))),
-                                ExpressionStatement(
-                                    InvocationExpression(IdentifierName("ValidateProperty"))
-                                    .AddArgumentListArguments(
-                                        Argument(IdentifierName("value")),
-                                        Argument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(propertyName))))))
-                            .AddStatements(dependentPropertyNotificationStatements.ToArray())));
-                }
-            }
-            else
-            {
-                BlockSyntax updateAndNotificationBlock = Block();
-
-                // Add OnPropertyChanging(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.PropertyNamePropertyChangingEventArgs) if necessary
-                if (isNotifyPropertyChanging)
-                {
-                    propertyChangingNames.Add(propertyName);
-
-                    updateAndNotificationBlock = updateAndNotificationBlock.AddStatements(ExpressionStatement(
-                        InvocationExpression(IdentifierName("OnPropertyChanging"))
-                        .AddArgumentListArguments(Argument(MemberAccessExpression(
-                            SyntaxKind.SimpleMemberAccessExpression,
-                            IdentifierName("global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs"),
-                            IdentifierName($"{propertyName}{nameof(PropertyChangingEventArgs)}"))))));
-                }
-
-                propertyChangedNames.Add(propertyName);
-
-                // Add the following statements:
-                //
-                // <FIELD_NAME> = value;
-                // OnPropertyChanged(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.PropertyNamePropertyChangedEventArgs);
-                updateAndNotificationBlock = updateAndNotificationBlock.AddStatements(
-                    ExpressionStatement(
-                        AssignmentExpression(
-                            SyntaxKind.SimpleAssignmentExpression,
-                            fieldExpression,
-                            IdentifierName("value"))),
-                    ExpressionStatement(
-                        InvocationExpression(IdentifierName("OnPropertyChanged"))
-                        .AddArgumentListArguments(Argument(MemberAccessExpression(
-                            SyntaxKind.SimpleMemberAccessExpression,
-                            IdentifierName("global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs"),
-                            IdentifierName($"{propertyName}{nameof(PropertyChangedEventArgs)}"))))));
-
-                // Add the dependent property notifications at the end
-                updateAndNotificationBlock = updateAndNotificationBlock.AddStatements(dependentPropertyNotificationStatements.ToArray());
-
-                // Generate the inner setter block as follows:
-                //
-                // if (!global::System.Collections.Generic.EqualityComparer<<FIELD_TYPE>>.Default.Equals(<FIELD_NAME>, value))
-                // {
-                //     OnPropertyChanging(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.PropertyNamePropertyChangingEventArgs); // Optional
-                //     <FIELD_NAME> = value;
-                //     OnPropertyChanged(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.PropertyNamePropertyChangedEventArgs);
-                //     OnPropertyChanged(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.Property1PropertyChangedEventArgs); // Optional
-                //     OnPropertyChanged(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.Property2PropertyChangedEventArgs);
-                //     ...
-                //     OnPropertyChanged(global::Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__KnownINotifyPropertyChangedOrChangingArgs.PropertyNPropertyChangedEventArgs);
-                // }
-                setterBlock = Block(
-                    IfStatement(
-                        PrefixUnaryExpression(
-                            SyntaxKind.LogicalNotExpression,
-                            InvocationExpression(
-                                MemberAccessExpression(
-                                    SyntaxKind.SimpleMemberAccessExpression,
-                                    MemberAccessExpression(
-                                        SyntaxKind.SimpleMemberAccessExpression,
-                                        GenericName(Identifier("global::System.Collections.Generic.EqualityComparer"))
-                                        .AddTypeArgumentListArguments(IdentifierName(typeName)),
-                                        IdentifierName("Default")),
-                                    IdentifierName("Equals")))
-                            .AddArgumentListArguments(
-                                    Argument(fieldExpression),
-                                    Argument(IdentifierName("value")))),
-                        updateAndNotificationBlock));
-            }
-
-            // Get the right type for the declared property (including nullability annotations)
-            TypeSyntax propertyType = IdentifierName(typeName);
-
-            if (fieldSymbol.Type is { IsReferenceType: true, NullableAnnotation: NullableAnnotation.Annotated })
-            {
-                propertyType = NullableType(propertyType);
-            }
-
-            // Construct the generated property as follows:
-            //
-            // <FIELD_TRIVIA>
-            // [global::System.CodeDom.Compiler.GeneratedCode("...", "...")]
-            // [global::System.Diagnostics.DebuggerNonUserCode]
-            // [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-            // <VALIDATION_ATTRIBUTE1> // Optional
-            // <VALIDATION_ATTRIBUTE2>
-            // ...
-            // <VALIDATION_ATTRIBUTEN>
-            // public <FIELD_TYPE><NULLABLE_ANNOTATION?> <PROPERTY_NAME>
-            // {
-            //     get => <FIELD_NAME>;
-            //     set
-            //     {
-            //         <BODY>
-            //     }
-            // }
-            return
-                PropertyDeclaration(propertyType, Identifier(propertyName))
-                .AddAttributeLists(
-                    AttributeList(SingletonSeparatedList(
-                        Attribute(IdentifierName("global::System.CodeDom.Compiler.GeneratedCode"))
-                        .AddArgumentListArguments(
-                            AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(ObservablePropertyGenerator).FullName))),
-                            AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(ObservablePropertyGenerator).Assembly.GetName().Version.ToString())))))),
-                    AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.DebuggerNonUserCode")))),
-                    AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage")))))
-                .AddAttributeLists(validationAttributes.Select(static a => AttributeList(SingletonSeparatedList(a))).ToArray())
-                .WithLeadingTrivia(leadingTrivia.Where(static trivia => !trivia.IsKind(SyntaxKind.RegionDirectiveTrivia) && !trivia.IsKind(SyntaxKind.EndRegionDirectiveTrivia)))
-                .AddModifiers(Token(SyntaxKind.PublicKeyword))
-                .AddAccessorListAccessors(
-                    AccessorDeclaration(SyntaxKind.GetAccessorDeclaration)
-                    .WithExpressionBody(ArrowExpressionClause(IdentifierName(fieldSymbol.Name)))
-                    .WithSemicolonToken(Token(SyntaxKind.SemicolonToken)),
-                    AccessorDeclaration(SyntaxKind.SetAccessorDeclaration)
-                    .WithBody(setterBlock));
-        }
-
-        /// <summary>
-        /// Get the generated property name for an input field.
-        /// </summary>
-        /// <param name="fieldSymbol">The input <see cref="IFieldSymbol"/> instance to process.</param>
-        /// <returns>The generated property name for <paramref name="fieldSymbol"/>.</returns>
-        [Pure]
-        public static string GetGeneratedPropertyName(IFieldSymbol fieldSymbol)
-        {
-            string propertyName = fieldSymbol.Name;
-
-            if (propertyName.StartsWith("m_"))
-            {
-                propertyName = propertyName.Substring(2);
-            }
-            else if (propertyName.StartsWith("_"))
-            {
-                propertyName = propertyName.TrimStart('_');
-            }
-
-            return $"{char.ToUpper(propertyName[0])}{propertyName.Substring(1)}";
-        }
-
-        /// <summary>
-        /// Processes the cached property changed/changing args.
-        /// </summary>
-        /// <param name="context">The input <see cref="GeneratorExecutionContext"/> instance to use.</param>
-        /// <param name="propertyChangedNames">The collection of discovered property changed names.</param>
-        /// <param name="propertyChangingNames">The collection of discovered property changing names.</param>
-        public void OnExecuteForPropertyArgs(GeneratorExecutionContext context, IReadOnlyCollection<string> propertyChangedNames, IReadOnlyCollection<string> propertyChangingNames)
-        {
-            if (propertyChangedNames.Count == 0 &&
-                propertyChangingNames.Count == 0)
-            {
-                return;
-            }
-
-            INamedTypeSymbol
-                propertyChangedEventArgsSymbol = context.Compilation.GetTypeByMetadataName("System.ComponentModel.PropertyChangedEventArgs")!,
-                propertyChangingEventArgsSymbol = context.Compilation.GetTypeByMetadataName("System.ComponentModel.PropertyChangingEventArgs")!;
-
-            // Create a static method to validate all properties in a given class.
-            // This code takes a class symbol and produces a compilation unit as follows:
-            //
-            // // 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
-            //
-            // namespace Microsoft.Toolkit.Mvvm.ComponentModel.__Internals
-            // {
-            //     [global::System.CodeDom.Compiler.GeneratedCode("...", "...")]
-            //     [global::System.Diagnostics.DebuggerNonUserCode]
-            //     [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-            //     [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-            //     [global::System.Obsolete("This type is not intended to be used directly by user code")]
-            //     internal static class __KnownINotifyPropertyChangedOrChangingArgs
-            //     {
-            //         <FIELDS>
-            //     }
-            // }
-            var source =
-                CompilationUnit().AddMembers(
-                NamespaceDeclaration(IdentifierName("Microsoft.Toolkit.Mvvm.ComponentModel.__Internals")).WithLeadingTrivia(TriviaList(
-                    Comment("// Licensed to the .NET Foundation under one or more agreements."),
-                    Comment("// The .NET Foundation licenses this file to you under the MIT license."),
-                    Comment("// See the LICENSE file in the project root for more information."),
-                    Trivia(PragmaWarningDirectiveTrivia(Token(SyntaxKind.DisableKeyword), true)))).AddMembers(
-                ClassDeclaration("__KnownINotifyPropertyChangedOrChangingArgs").AddModifiers(
-                    Token(SyntaxKind.InternalKeyword),
-                    Token(SyntaxKind.StaticKeyword)).AddAttributeLists(
-                        AttributeList(SingletonSeparatedList(
-                            Attribute(IdentifierName($"global::System.CodeDom.Compiler.GeneratedCode"))
-                            .AddArgumentListArguments(
-                                AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(GetType().FullName))),
-                                AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(GetType().Assembly.GetName().Version.ToString())))))),
-                        AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.DebuggerNonUserCode")))),
-                        AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage")))),
-                        AttributeList(SingletonSeparatedList(
-                            Attribute(IdentifierName("global::System.ComponentModel.EditorBrowsable")).AddArgumentListArguments(
-                            AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never"))))),
-                        AttributeList(SingletonSeparatedList(
-                            Attribute(IdentifierName("global::System.Obsolete")).AddArgumentListArguments(
-                            AttributeArgument(LiteralExpression(
-                                SyntaxKind.StringLiteralExpression,
-                                Literal("This type is not intended to be used directly by user code")))))))
-                    .AddMembers(propertyChangedNames.Select(name => CreateFieldDeclaration(propertyChangedEventArgsSymbol, name)).ToArray())
-                    .AddMembers(propertyChangingNames.Select(name => CreateFieldDeclaration(propertyChangingEventArgsSymbol, name)).ToArray())))
-                .NormalizeWhitespace()
-                .ToFullString();
-
-            // Add the partial type
-            context.AddSource("__KnownINotifyPropertyChangedOrChangingArgs.cs", SourceText.From(source, Encoding.UTF8));
-        }
-
-        /// <summary>
-        /// Creates a field declaration for a cached property change name.
-        /// </summary>
-        /// <param name="type">The type of cached property change argument (either <see cref="PropertyChangedEventArgs"/> or <see cref="PropertyChangingEventArgs"/>).</param>
-        /// <param name="propertyName">The name of the cached property name.</param>
-        /// <returns>A <see cref="FieldDeclarationSyntax"/> instance for the input cached property name.</returns>
-        [Pure]
-        private static FieldDeclarationSyntax CreateFieldDeclaration(INamedTypeSymbol type, string propertyName)
-        {
-            // Create a static field with a cached property changed/changing argument for a specified property.
-            // This code produces a field declaration as follows:
-            //
-            // [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-            // [global::System.Obsolete("This field is not intended to be referenced directly by user code")]
-            // public static readonly <ARG_TYPE> <PROPERTY_NAME><ARG_TYPE> = new("<PROPERTY_NAME>");
-            return
-                FieldDeclaration(
-                VariableDeclaration(IdentifierName(type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)))
-                .AddVariables(
-                    VariableDeclarator(Identifier($"{propertyName}{type.Name}"))
-                    .WithInitializer(EqualsValueClause(
-                        ImplicitObjectCreationExpression()
-                        .AddArgumentListArguments(Argument(
-                            LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(propertyName))))))))
-                .AddModifiers(
-                    Token(SyntaxKind.PublicKeyword),
-                    Token(SyntaxKind.StaticKeyword),
-                    Token(SyntaxKind.ReadOnlyKeyword))
-                .AddAttributeLists(
-                    AttributeList(SingletonSeparatedList(
-                        Attribute(IdentifierName("global::System.ComponentModel.EditorBrowsable")).AddArgumentListArguments(
-                        AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never"))))),
-                    AttributeList(SingletonSeparatedList(
-                        Attribute(IdentifierName("global::System.Obsolete")).AddArgumentListArguments(
-                        AttributeArgument(LiteralExpression(
-                            SyntaxKind.StringLiteralExpression,
-                            Literal("This field is not intended to be referenced directly by user code")))))));
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableRecipientGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableRecipientGenerator.cs
deleted file mode 100644
index 7a2228bfde0..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableRecipientGenerator.cs
+++ /dev/null
@@ -1,131 +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.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions;
-using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
-using static Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics.DiagnosticDescriptors;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <summary>
-    /// A source generator for the <c>ObservableRecipientAttribute</c> type.
-    /// </summary>
-    [Generator]
-    public sealed class ObservableRecipientGenerator : TransitiveMembersGenerator
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableRecipientGenerator"/> class.
-        /// </summary>
-        public ObservableRecipientGenerator()
-            : base("Microsoft.Toolkit.Mvvm.ComponentModel.ObservableRecipientAttribute")
-        {
-        }
-
-        /// <inheritdoc/>
-        protected override DiagnosticDescriptor TargetTypeErrorDescriptor => ObservableRecipientGeneratorError;
-
-        /// <inheritdoc/>
-        protected override bool ValidateTargetType(
-            GeneratorExecutionContext context,
-            AttributeData attributeData,
-            ClassDeclarationSyntax classDeclaration,
-            INamedTypeSymbol classDeclarationSymbol,
-            [NotNullWhen(false)] out DiagnosticDescriptor? descriptor)
-        {
-            INamedTypeSymbol
-                observableRecipientSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.ComponentModel.ObservableRecipient")!,
-                observableObjectSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.ComponentModel.ObservableObject")!,
-                observableObjectAttributeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.ComponentModel.ObservableObjectAttribute")!,
-                iNotifyPropertyChangedSymbol = context.Compilation.GetTypeByMetadataName("System.ComponentModel.INotifyPropertyChanged")!;
-
-            // Check if the type already inherits from ObservableRecipient
-            if (classDeclarationSymbol.InheritsFrom(observableRecipientSymbol))
-            {
-                descriptor = DuplicateObservableRecipientError;
-
-                return false;
-            }
-
-            // In order to use [ObservableRecipient], the target type needs to inherit from ObservableObject,
-            // or be annotated with [ObservableObject] or [INotifyPropertyChanged] (with additional helpers).
-            if (!classDeclarationSymbol.InheritsFrom(observableObjectSymbol) &&
-                !classDeclarationSymbol.GetAttributes().Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, observableObjectAttributeSymbol)) &&
-                !classDeclarationSymbol.GetAttributes().Any(a =>
-                    SymbolEqualityComparer.Default.Equals(a.AttributeClass, iNotifyPropertyChangedSymbol) &&
-                    !a.HasNamedArgument("IncludeAdditionalHelperMethods", false)))
-            {
-                descriptor = MissingBaseObservableObjectFunctionalityError;
-
-                return false;
-            }
-
-            descriptor = null;
-
-            return true;
-        }
-
-        /// <inheritdoc/>
-        protected override IEnumerable<MemberDeclarationSyntax> FilterDeclaredMembers(
-            GeneratorExecutionContext context,
-            AttributeData attributeData,
-            ClassDeclarationSyntax classDeclaration,
-            INamedTypeSymbol classDeclarationSymbol,
-            ClassDeclarationSyntax sourceDeclaration)
-        {
-            // If the target type has no constructors, generate constructors as well
-            if (classDeclarationSymbol.InstanceConstructors.Length == 1 &&
-                classDeclarationSymbol.InstanceConstructors[0] is
-                {
-                    Parameters: { IsEmpty: true },
-                    DeclaringSyntaxReferences: { IsEmpty: true },
-                    IsImplicitlyDeclared: true
-                })
-            {
-                foreach (ConstructorDeclarationSyntax ctor in sourceDeclaration.Members.OfType<ConstructorDeclarationSyntax>())
-                {
-                    string
-                        text = ctor.NormalizeWhitespace().ToFullString(),
-                        replaced = text.Replace("ObservableRecipient", classDeclarationSymbol.Name);
-
-                    // Adjust the visibility of the constructors based on whether the target type is abstract.
-                    // If that is not the case, the constructors have to be declared as public and not protected.
-                    if (!classDeclarationSymbol.IsAbstract)
-                    {
-                        replaced = replaced.Replace("protected", "public");
-                    }
-
-                    yield return (ConstructorDeclarationSyntax)ParseMemberDeclaration(replaced)!;
-                }
-            }
-
-            INamedTypeSymbol observableValidatorSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.ComponentModel.ObservableValidator")!;
-
-            // Skip the SetProperty overloads if the target type inherits from ObservableValidator, to avoid conflicts
-            if (classDeclarationSymbol.InheritsFrom(observableValidatorSymbol))
-            {
-                foreach (MemberDeclarationSyntax member in sourceDeclaration.Members.Where(static member => member is not ConstructorDeclarationSyntax))
-                {
-                    if (member is not MethodDeclarationSyntax { Identifier: { ValueText: "SetProperty" } })
-                    {
-                        yield return member;
-                    }
-                }
-
-                yield break;
-            }
-
-            // If the target type has at least one custom constructor, only generate methods
-            foreach (MemberDeclarationSyntax member in sourceDeclaration.Members.Where(static member => member is not ConstructorDeclarationSyntax))
-            {
-                yield return member;
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.SyntaxReceiver.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.SyntaxReceiver.cs
deleted file mode 100644
index ece1653b246..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.SyntaxReceiver.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.Collections.Generic;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <inheritdoc cref="ObservableValidatorValidateAllPropertiesGenerator"/>
-    public sealed partial class ObservableValidatorValidateAllPropertiesGenerator
-    {
-        /// <summary>
-        /// An <see cref="ISyntaxContextReceiver"/> that selects candidate nodes to process.
-        /// </summary>
-        private sealed class SyntaxReceiver : ISyntaxContextReceiver
-        {
-            /// <summary>
-            /// The list of info gathered during exploration.
-            /// </summary>
-            private readonly List<INamedTypeSymbol> gatheredInfo = new();
-
-            /// <summary>
-            /// Gets the collection of gathered info to process.
-            /// </summary>
-            public IReadOnlyCollection<INamedTypeSymbol> GatheredInfo => this.gatheredInfo;
-
-            /// <inheritdoc/>
-            public void OnVisitSyntaxNode(GeneratorSyntaxContext context)
-            {
-                if (context.Node is ClassDeclarationSyntax classDeclaration &&
-                    context.SemanticModel.GetDeclaredSymbol(classDeclaration) is INamedTypeSymbol { IsGenericType: false } classSymbol &&
-                    context.SemanticModel.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.ComponentModel.ObservableValidator") is INamedTypeSymbol validatorSymbol &&
-                    classSymbol.InheritsFrom(validatorSymbol))
-                {
-                    this.gatheredInfo.Add(classSymbol);
-                }
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.cs
deleted file mode 100644
index dd68fa72bba..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.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 System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Diagnostics.Contracts;
-using System.Linq;
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions;
-using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
-using static Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics.DiagnosticDescriptors;
-
-#pragma warning disable SA1008
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <summary>
-    /// A source generator for properties validation without relying on compiled LINQ expressions.
-    /// </summary>
-    [Generator]
-    public sealed partial class ObservableValidatorValidateAllPropertiesGenerator : ISourceGenerator
-    {
-        /// <inheritdoc/>
-        public void Initialize(GeneratorInitializationContext context)
-        {
-            context.RegisterForSyntaxNotifications(static () => new SyntaxReceiver());
-        }
-
-        /// <inheritdoc/>
-        public void Execute(GeneratorExecutionContext context)
-        {
-            // Get the syntax receiver with the candidate nodes
-            if (context.SyntaxContextReceiver is not SyntaxReceiver syntaxReceiver ||
-                syntaxReceiver.GatheredInfo.Count == 0)
-            {
-                return;
-            }
-
-            // Validate the language version (this needs at least C# 8.0 due to static local functions being used).
-            // If a lower C# version is set, just skip the execution silently. The fallback path will be used just fine.
-            if (context.ParseOptions is not CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp8 })
-            {
-                return;
-            }
-
-            // Get the symbol for the required attributes
-            INamedTypeSymbol
-                validationSymbol = context.Compilation.GetTypeByMetadataName("System.ComponentModel.DataAnnotations.ValidationAttribute")!,
-                observablePropertySymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.ComponentModel.ObservablePropertyAttribute")!;
-
-            // Prepare the attributes to add to the first class declaration
-            AttributeListSyntax[] classAttributes = new[]
-            {
-                AttributeList(SingletonSeparatedList(
-                    Attribute(IdentifierName($"global::System.CodeDom.Compiler.GeneratedCode"))
-                    .AddArgumentListArguments(
-                        AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(GetType().FullName))),
-                        AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(GetType().Assembly.GetName().Version.ToString())))))),
-                AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.DebuggerNonUserCode")))),
-                AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage")))),
-                AttributeList(SingletonSeparatedList(
-                    Attribute(IdentifierName("global::System.ComponentModel.EditorBrowsable")).AddArgumentListArguments(
-                    AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never"))))),
-                AttributeList(SingletonSeparatedList(
-                    Attribute(IdentifierName("global::System.Obsolete")).AddArgumentListArguments(
-                    AttributeArgument(LiteralExpression(
-                        SyntaxKind.StringLiteralExpression,
-                        Literal("This type is not intended to be used directly by user code"))))))
-            };
-
-            foreach (INamedTypeSymbol classSymbol in syntaxReceiver.GatheredInfo)
-            {
-                // Create a static factory method creating a delegate that can be used to validate all properties in a given class.
-                // This pattern is used so that the library doesn't have to use MakeGenericType(...) at runtime, nor use unsafe casts
-                // over the created delegate to be able to cache it as an Action<object> instance. This pattern enables the same
-                // functionality and with almost identical performance (not noticeable in this context anyway), but while preserving
-                // full runtime type safety (as a safe cast is used to validate the input argument), and with less reflection needed.
-                // Note that we're deliberately creating a new delegate instance here and not using code that could see the C# compiler
-                // create a static class to cache a reusable delegate, because each generated method will only be called at most once,
-                // as the returned delegate will be cached by the MVVM Toolkit itself. So this ensures the the produced code is minimal,
-                // and that there will be no unnecessary static fields and objects being created and possibly never collected.
-                // This code takes a class symbol and produces a compilation unit as follows:
-                //
-                // // 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
-                //
-                // namespace Microsoft.Toolkit.Mvvm.ComponentModel.__Internals
-                // {
-                //     [global::System.CodeDom.Compiler.GeneratedCode("...", "...")]
-                //     [global::System.Diagnostics.DebuggerNonUserCode]
-                //     [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-                //     [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-                //     [global::System.Obsolete("This type is not intended to be used directly by user code")]
-                //     internal static partial class __ObservableValidatorExtensions
-                //     {
-                //         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-                //         [global::System.Obsolete("This method is not intended to be called directly by user code")]
-                //         public static global::System.Action<object> CreateAllPropertiesValidator(<INSTANCE_TYPE> _)
-                //         {
-                //             static void ValidateAllProperties(object obj)
-                //             {
-                //                 var instance = (<INSTANCE_TYPE>)obj;
-                //                 <BODY>
-                //             }
-                //
-                //             return ValidateAllProperties;
-                //         }
-                //     }
-                // }
-                var source =
-                    CompilationUnit().AddMembers(
-                    NamespaceDeclaration(IdentifierName("Microsoft.Toolkit.Mvvm.ComponentModel.__Internals")).WithLeadingTrivia(TriviaList(
-                        Comment("// Licensed to the .NET Foundation under one or more agreements."),
-                        Comment("// The .NET Foundation licenses this file to you under the MIT license."),
-                        Comment("// See the LICENSE file in the project root for more information."),
-                        Trivia(PragmaWarningDirectiveTrivia(Token(SyntaxKind.DisableKeyword), true)))).AddMembers(
-                    ClassDeclaration("__ObservableValidatorExtensions").AddModifiers(
-                        Token(SyntaxKind.InternalKeyword),
-                        Token(SyntaxKind.StaticKeyword),
-                        Token(SyntaxKind.PartialKeyword)).AddAttributeLists(classAttributes).AddMembers(
-                    MethodDeclaration(
-                        GenericName("global::System.Action").AddTypeArgumentListArguments(PredefinedType(Token(SyntaxKind.ObjectKeyword))),
-                        Identifier("CreateAllPropertiesValidator")).AddAttributeLists(
-                            AttributeList(SingletonSeparatedList(
-                                Attribute(IdentifierName("global::System.ComponentModel.EditorBrowsable")).AddArgumentListArguments(
-                                AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never"))))),
-                            AttributeList(SingletonSeparatedList(
-                                Attribute(IdentifierName("global::System.Obsolete")).AddArgumentListArguments(
-                                AttributeArgument(LiteralExpression(
-                                    SyntaxKind.StringLiteralExpression,
-                                    Literal("This method is not intended to be called directly by user code"))))))).AddModifiers(
-                        Token(SyntaxKind.PublicKeyword),
-                        Token(SyntaxKind.StaticKeyword)).AddParameterListParameters(
-                            Parameter(Identifier("_")).WithType(IdentifierName(classSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat))))
-                        .WithBody(Block(
-                            LocalFunctionStatement(
-                                PredefinedType(Token(SyntaxKind.VoidKeyword)),
-                                Identifier("ValidateAllProperties"))
-                            .AddModifiers(Token(SyntaxKind.StaticKeyword))
-                            .AddParameterListParameters(
-                                Parameter(Identifier("obj")).WithType(PredefinedType(Token(SyntaxKind.ObjectKeyword))))
-                            .WithBody(Block(
-                                LocalDeclarationStatement(
-                                    VariableDeclaration(IdentifierName("var")) // Cannot use Token(SyntaxKind.VarKeyword) here (throws an ArgumentException)
-                                    .AddVariables(
-                                        VariableDeclarator(Identifier("instance"))
-                                        .WithInitializer(EqualsValueClause(
-                                            CastExpression(
-                                                IdentifierName(classSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)),
-                                                IdentifierName("obj")))))))
-                                .AddStatements(EnumerateValidationStatements(classSymbol, validationSymbol, observablePropertySymbol).ToArray())),
-                            ReturnStatement(IdentifierName("ValidateAllProperties")))))))
-                    .NormalizeWhitespace()
-                    .ToFullString();
-
-                // Reset the attributes list (so the same class doesn't get duplicate attributes)
-                classAttributes = Array.Empty<AttributeListSyntax>();
-
-                // Add the partial type
-                context.AddSource($"{classSymbol.GetFullMetadataNameForFileName()}.cs", SourceText.From(source, Encoding.UTF8));
-            }
-        }
-
-        /// <summary>
-        /// Gets a sequence of statements to validate declared properties (including generated ones).
-        /// </summary>
-        /// <param name="classSymbol">The input <see cref="INamedTypeSymbol"/> instance to process.</param>
-        /// <param name="validationSymbol">The type symbol for the <c>ValidationAttribute</c> type.</param>
-        /// <param name="observablePropertySymbol">The type symbol for the <c>ObservablePropertyAttribute</c> type.</param>
-        /// <returns>The sequence of <see cref="StatementSyntax"/> instances to validate declared properties.</returns>
-        [Pure]
-        private static IEnumerable<StatementSyntax> EnumerateValidationStatements(INamedTypeSymbol classSymbol, INamedTypeSymbol validationSymbol, INamedTypeSymbol observablePropertySymbol)
-        {
-            foreach (var memberSymbol in classSymbol.GetMembers())
-            {
-                if (memberSymbol is not (IPropertySymbol { IsIndexer: false } or IFieldSymbol))
-                {
-                    continue;
-                }
-
-                ImmutableArray<AttributeData> attributes = memberSymbol.GetAttributes();
-
-                // Also include fields that are annotated with [ObservableProperty]. This is necessary because
-                // all generators run in an undefined order and looking at the same original compilation, so the
-                // current one wouldn't be able to see generated properties from other generators directly.
-                if (memberSymbol is IFieldSymbol &&
-                    !attributes.Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, observablePropertySymbol)))
-                {
-                    continue;
-                }
-
-                // Skip the current member if there are no validation attributes applied to it
-                if (!attributes.Any(a => a.AttributeClass?.InheritsFrom(validationSymbol) == true))
-                {
-                    continue;
-                }
-
-                // Get the target property name either directly or matching the generated one
-                string propertyName = memberSymbol switch
-                {
-                    IPropertySymbol propertySymbol => propertySymbol.Name,
-                    IFieldSymbol fieldSymbol => ObservablePropertyGenerator.GetGeneratedPropertyName(fieldSymbol),
-                    _ => throw new InvalidOperationException("Invalid symbol type")
-                };
-
-                // This enumerator produces a sequence of statements as follows:
-                //
-                // __ObservableValidatorHelper.ValidateProperty(instance, instance.<PROPERTY_0>, nameof(instance.<PROPERTY_0>));
-                // __ObservableValidatorHelper.ValidateProperty(instance, instance.<PROPERTY_0>, nameof(instance.<PROPERTY_0>));
-                // ...
-                // __ObservableValidatorHelper.ValidateProperty(instance, instance.<PROPERTY_1>, nameof(instance.<PROPERTY_1>));
-                yield return
-                    ExpressionStatement(
-                        InvocationExpression(
-                            MemberAccessExpression(
-                                SyntaxKind.SimpleMemberAccessExpression,
-                                IdentifierName("__ObservableValidatorHelper"),
-                                IdentifierName("ValidateProperty")))
-                        .AddArgumentListArguments(
-                            Argument(IdentifierName("instance")),
-                            Argument(
-                                MemberAccessExpression(
-                                    SyntaxKind.SimpleMemberAccessExpression,
-                                    IdentifierName("instance"),
-                                    IdentifierName(propertyName))),
-                            Argument(
-                                InvocationExpression(IdentifierName("nameof"))
-                                .AddArgumentListArguments(Argument(
-                                    MemberAccessExpression(
-                                        SyntaxKind.SimpleMemberAccessExpression,
-                                        IdentifierName("instance"),
-                                        IdentifierName(propertyName)))))));
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.SyntaxReceiver.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.SyntaxReceiver.cs
deleted file mode 100644
index b370089d644..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.SyntaxReceiver.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.Collections.Generic;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <inheritdoc cref="TransitiveMembersGenerator"/>
-    public abstract partial class TransitiveMembersGenerator
-    {
-        /// <summary>
-        /// An <see cref="ISyntaxContextReceiver"/> that selects candidate nodes to process.
-        /// </summary>
-        private sealed class SyntaxReceiver : ISyntaxContextReceiver
-        {
-            /// <summary>
-            /// The fully qualified name of the attribute type to look for.
-            /// </summary>
-            private readonly string attributeTypeFullName;
-
-            /// <summary>
-            /// The list of info gathered during exploration.
-            /// </summary>
-            private readonly List<Item> gatheredInfo = new();
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="SyntaxReceiver"/> class.
-            /// </summary>
-            /// <param name="attributeTypeFullName">The fully qualified name of the attribute type to look for.</param>
-            public SyntaxReceiver(string attributeTypeFullName)
-            {
-                this.attributeTypeFullName = attributeTypeFullName;
-            }
-
-            /// <summary>
-            /// Gets the collection of gathered info to process.
-            /// </summary>
-            public IReadOnlyCollection<Item> GatheredInfo => this.gatheredInfo;
-
-            /// <inheritdoc/>
-            public void OnVisitSyntaxNode(GeneratorSyntaxContext context)
-            {
-                if (context.Node is ClassDeclarationSyntax { AttributeLists: { Count: > 0 } } classDeclaration &&
-                    context.SemanticModel.GetDeclaredSymbol(classDeclaration) is INamedTypeSymbol classSymbol &&
-                    context.SemanticModel.Compilation.GetTypeByMetadataName(this.attributeTypeFullName) is INamedTypeSymbol attributeSymbol &&
-                    classSymbol.GetAttributes().FirstOrDefault(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, attributeSymbol)) is AttributeData attributeData &&
-                    attributeData.ApplicationSyntaxReference is SyntaxReference syntaxReference &&
-                    syntaxReference.GetSyntax() is AttributeSyntax attributeSyntax)
-                {
-                    this.gatheredInfo.Add(new Item(classDeclaration, classSymbol, attributeSyntax, attributeData));
-                }
-            }
-
-            /// <summary>
-            /// A model for a group of item representing a discovered type to process.
-            /// </summary>
-            /// <param name="ClassDeclaration">The <see cref="ClassDeclarationSyntax"/> instance for the target class declaration.</param>
-            /// <param name="ClassSymbol">The <see cref="INamedTypeSymbol"/> instance for <paramref name="ClassDeclaration"/>.</param>
-            /// <param name="AttributeSyntax">The <see cref="AttributeSyntax"/> instance for the target attribute over <paramref name="ClassDeclaration"/>.</param>
-            /// <param name="AttributeData">The <see cref="AttributeData"/> instance for <paramref name="AttributeSyntax"/>.</param>
-            public sealed record Item(
-                ClassDeclarationSyntax ClassDeclaration,
-                INamedTypeSymbol ClassSymbol,
-                AttributeSyntax AttributeSyntax,
-                AttributeData AttributeData);
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs
deleted file mode 100644
index 6c848347727..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs
+++ /dev/null
@@ -1,286 +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.CodeAnalysis;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics;
-using Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions;
-using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
-using static Microsoft.CodeAnalysis.SymbolDisplayTypeQualificationStyle;
-using static Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics.DiagnosticDescriptors;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <summary>
-    /// A source generator for a given attribute type.
-    /// </summary>
-    public abstract partial class TransitiveMembersGenerator : ISourceGenerator
-    {
-        /// <summary>
-        /// The fully qualified name of the attribute type to look for.
-        /// </summary>
-        private readonly string attributeTypeFullName;
-
-        /// <summary>
-        /// The name of the attribute type to look for.
-        /// </summary>
-        private readonly string attributeTypeName;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TransitiveMembersGenerator"/> class.
-        /// </summary>
-        /// <param name="attributeTypeFullName">The fully qualified name of the attribute type to look for.</param>
-        protected TransitiveMembersGenerator(string attributeTypeFullName)
-        {
-            this.attributeTypeFullName = attributeTypeFullName;
-            this.attributeTypeName = attributeTypeFullName.Split('.').Last();
-        }
-
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when the generation failed for a given type.
-        /// </summary>
-        protected abstract DiagnosticDescriptor TargetTypeErrorDescriptor { get; }
-
-        /// <inheritdoc/>
-        public void Initialize(GeneratorInitializationContext context)
-        {
-            context.RegisterForSyntaxNotifications(() => new SyntaxReceiver(this.attributeTypeFullName));
-        }
-
-        /// <inheritdoc/>
-        public void Execute(GeneratorExecutionContext context)
-        {
-            // Get the syntax receiver with the candidate nodes
-            if (context.SyntaxContextReceiver is not SyntaxReceiver syntaxReceiver ||
-                syntaxReceiver.GatheredInfo.Count == 0)
-            {
-                return;
-            }
-
-            // Validate the language version
-            if (context.ParseOptions is not CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp9 })
-            {
-                context.ReportDiagnostic(Diagnostic.Create(UnsupportedCSharpLanguageVersionError, null));
-            }
-
-            // Load the syntax tree with the members to generate
-            SyntaxTree sourceSyntaxTree = LoadSourceSyntaxTree();
-
-            foreach (SyntaxReceiver.Item item in syntaxReceiver.GatheredInfo)
-            {
-                if (!ValidateTargetType(context, item.AttributeData, item.ClassDeclaration, item.ClassSymbol, out var descriptor))
-                {
-                    context.ReportDiagnostic(descriptor, item.AttributeSyntax, item.ClassSymbol);
-
-                    continue;
-                }
-
-                try
-                {
-                    OnExecute(context, item.AttributeData, item.ClassDeclaration, item.ClassSymbol, sourceSyntaxTree);
-                }
-                catch
-                {
-                    context.ReportDiagnostic(TargetTypeErrorDescriptor, item.AttributeSyntax, item.ClassSymbol);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Loads the source syntax tree for the current generator.
-        /// </summary>
-        /// <returns>The syntax tree with the elements to emit in the generated code.</returns>
-        [Pure]
-        private SyntaxTree LoadSourceSyntaxTree()
-        {
-            string filename = $"Microsoft.Toolkit.Mvvm.SourceGenerators.EmbeddedResources.{this.attributeTypeName.Replace("Attribute", string.Empty)}.cs";
-
-            Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(filename);
-            StreamReader reader = new(stream);
-
-            string observableObjectSource = reader.ReadToEnd();
-
-            return CSharpSyntaxTree.ParseText(observableObjectSource);
-        }
-
-        /// <summary>
-        /// Processes a given target type.
-        /// </summary>
-        /// <param name="context">The input <see cref="GeneratorExecutionContext"/> instance to use.</param>
-        /// <param name="attributeData">The <see cref="AttributeData"/> for the current attribute being processed.</param>
-        /// <param name="classDeclaration">The <see cref="ClassDeclarationSyntax"/> node to process.</param>
-        /// <param name="classDeclarationSymbol">The <see cref="INamedTypeSymbol"/> for <paramref name="classDeclaration"/>.</param>
-        /// <param name="sourceSyntaxTree">The <see cref="CodeAnalysis.SyntaxTree"/> for the target parsed source.</param>
-        private void OnExecute(
-            GeneratorExecutionContext context,
-            AttributeData attributeData,
-            ClassDeclarationSyntax classDeclaration,
-            INamedTypeSymbol classDeclarationSymbol,
-            SyntaxTree sourceSyntaxTree)
-        {
-            ClassDeclarationSyntax sourceDeclaration = sourceSyntaxTree.GetRoot().DescendantNodes().OfType<ClassDeclarationSyntax>().First();
-            UsingDirectiveSyntax[] usingDirectives = sourceSyntaxTree.GetRoot().DescendantNodes().OfType<UsingDirectiveSyntax>().ToArray();
-            BaseListSyntax? baseListSyntax = BaseList(SeparatedList(
-                sourceDeclaration.BaseList?.Types
-                .OfType<SimpleBaseTypeSyntax>()
-                .Select(static t => t.Type)
-                .OfType<IdentifierNameSyntax>()
-                .Where(static t => t.Identifier.ValueText.StartsWith("I"))
-                .Select(static t => SimpleBaseType(t))
-                .ToArray()
-                ?? Array.Empty<BaseTypeSyntax>()));
-
-            if (baseListSyntax.Types.Count == 0)
-            {
-                baseListSyntax = null;
-            }
-
-            // Create the class declaration for the user type. This will produce a tree as follows:
-            //
-            // <MODIFIERS> <CLASS_NAME> : <BASE_TYPES>
-            // {
-            //     <MEMBERS>
-            // }
-            var classDeclarationSyntax =
-                ClassDeclaration(classDeclaration.Identifier.Text)
-                .WithModifiers(classDeclaration.Modifiers)
-                .WithBaseList(baseListSyntax)
-                .AddMembers(OnLoadDeclaredMembers(context, attributeData, classDeclaration, classDeclarationSymbol, sourceDeclaration).ToArray());
-
-            TypeDeclarationSyntax typeDeclarationSyntax = classDeclarationSyntax;
-
-            // Add all parent types in ascending order, if any
-            foreach (var parentType in classDeclaration.Ancestors().OfType<TypeDeclarationSyntax>())
-            {
-                typeDeclarationSyntax = parentType
-                    .WithMembers(SingletonList<MemberDeclarationSyntax>(typeDeclarationSyntax))
-                    .WithConstraintClauses(List<TypeParameterConstraintClauseSyntax>())
-                    .WithBaseList(null)
-                    .WithAttributeLists(List<AttributeListSyntax>())
-                    .WithoutTrivia();
-            }
-
-            // Create the compilation unit with the namespace and target member.
-            // From this, we can finally generate the source code to output.
-            var namespaceName = classDeclarationSymbol.ContainingNamespace.ToDisplayString(new(typeQualificationStyle: NameAndContainingTypesAndNamespaces));
-
-            // Create the final compilation unit to generate (with using directives and the full type declaration)
-            var source =
-                CompilationUnit()
-                .AddMembers(NamespaceDeclaration(IdentifierName(namespaceName))
-                .AddMembers(typeDeclarationSyntax))
-                .AddUsings(usingDirectives.First().WithLeadingTrivia(TriviaList(
-                    Comment("// Licensed to the .NET Foundation under one or more agreements."),
-                    Comment("// The .NET Foundation licenses this file to you under the MIT license."),
-                    Comment("// See the LICENSE file in the project root for more information."),
-                    Trivia(PragmaWarningDirectiveTrivia(Token(SyntaxKind.DisableKeyword), true)))))
-                .AddUsings(usingDirectives.Skip(1).ToArray())
-                .NormalizeWhitespace()
-                .ToFullString();
-
-            // Add the partial type
-            context.AddSource($"{classDeclarationSymbol.GetFullMetadataNameForFileName()}.cs", SourceText.From(source, Encoding.UTF8));
-        }
-
-        /// <summary>
-        /// Loads the <see cref="MemberDeclarationSyntax"/> nodes to generate from the input parsed tree.
-        /// </summary>
-        /// <param name="context">The input <see cref="GeneratorExecutionContext"/> instance to use.</param>
-        /// <param name="attributeData">The <see cref="AttributeData"/> for the current attribute being processed.</param>
-        /// <param name="classDeclaration">The <see cref="ClassDeclarationSyntax"/> node to process.</param>
-        /// <param name="classDeclarationSymbol">The <see cref="INamedTypeSymbol"/> for <paramref name="classDeclaration"/>.</param>
-        /// <param name="sourceDeclaration">The parsed <see cref="ClassDeclarationSyntax"/> instance with the source nodes.</param>
-        /// <returns>A sequence of <see cref="MemberDeclarationSyntax"/> nodes to emit in the generated file.</returns>
-        private IEnumerable<MemberDeclarationSyntax> OnLoadDeclaredMembers(
-            GeneratorExecutionContext context,
-            AttributeData attributeData,
-            ClassDeclarationSyntax classDeclaration,
-            INamedTypeSymbol classDeclarationSymbol,
-            ClassDeclarationSyntax sourceDeclaration)
-        {
-            IEnumerable<MemberDeclarationSyntax> generatedMembers = FilterDeclaredMembers(context, attributeData, classDeclaration, classDeclarationSymbol, sourceDeclaration);
-
-            // Add the attributes on each member
-            return generatedMembers.Select(member =>
-            {
-                // [GeneratedCode] is always present
-                member = member
-                    .WithoutLeadingTrivia()
-                    .AddAttributeLists(AttributeList(SingletonSeparatedList(
-                        Attribute(IdentifierName($"global::System.CodeDom.Compiler.GeneratedCode"))
-                        .AddArgumentListArguments(
-                            AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(GetType().FullName))),
-                            AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(GetType().Assembly.GetName().Version.ToString())))))))
-                    .WithLeadingTrivia(member.GetLeadingTrivia());
-
-                // [DebuggerNonUserCode] is not supported over interfaces, events or fields
-                if (member.Kind() is not SyntaxKind.InterfaceDeclaration and not SyntaxKind.EventFieldDeclaration and not SyntaxKind.FieldDeclaration)
-                {
-                    member = member.AddAttributeLists(AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.DebuggerNonUserCode")))));
-                }
-
-                // [ExcludeFromCodeCoverage] is not supported on interfaces and fields
-                if (member.Kind() is not SyntaxKind.InterfaceDeclaration and not SyntaxKind.FieldDeclaration)
-                {
-                    member = member.AddAttributeLists(AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage")))));
-                }
-
-                // If the target class is sealed, make protected members private and remove the virtual modifier
-                if (classDeclarationSymbol.IsSealed)
-                {
-                    return member
-                        .ReplaceModifier(SyntaxKind.ProtectedKeyword, SyntaxKind.PrivateKeyword)
-                        .RemoveModifier(SyntaxKind.VirtualKeyword);
-                }
-
-                return member;
-            });
-        }
-
-        /// <summary>
-        /// Validates a target type being processed.
-        /// </summary>
-        /// <param name="context">The input <see cref="GeneratorExecutionContext"/> instance to use.</param>
-        /// <param name="attributeData">The <see cref="AttributeData"/> for the current attribute being processed.</param>
-        /// <param name="classDeclaration">The <see cref="ClassDeclarationSyntax"/> node to process.</param>
-        /// <param name="classDeclarationSymbol">The <see cref="INamedTypeSymbol"/> for <paramref name="classDeclaration"/>.</param>
-        /// <param name="descriptor">The resulting <see cref="DiagnosticDescriptor"/> to emit in case the target type isn't valid.</param>
-        /// <returns>Whether or not the target type is valid and can be processed normally.</returns>
-        protected abstract bool ValidateTargetType(
-            GeneratorExecutionContext context,
-            AttributeData attributeData,
-            ClassDeclarationSyntax classDeclaration,
-            INamedTypeSymbol classDeclarationSymbol,
-            [NotNullWhen(false)] out DiagnosticDescriptor? descriptor);
-
-        /// <summary>
-        /// Filters the <see cref="MemberDeclarationSyntax"/> nodes to generate from the input parsed tree.
-        /// </summary>
-        /// <param name="context">The input <see cref="GeneratorExecutionContext"/> instance to use.</param>
-        /// <param name="attributeData">The <see cref="AttributeData"/> for the current attribute being processed.</param>
-        /// <param name="classDeclaration">The <see cref="ClassDeclarationSyntax"/> node to process.</param>
-        /// <param name="classDeclarationSymbol">The <see cref="INamedTypeSymbol"/> for <paramref name="classDeclaration"/>.</param>
-        /// <param name="sourceDeclaration">The parsed <see cref="ClassDeclarationSyntax"/> instance with the source nodes.</param>
-        /// <returns>A sequence of <see cref="MemberDeclarationSyntax"/> nodes to emit in the generated file.</returns>
-        protected virtual IEnumerable<MemberDeclarationSyntax> FilterDeclaredMembers(
-            GeneratorExecutionContext context,
-            AttributeData attributeData,
-            ClassDeclarationSyntax classDeclaration,
-            INamedTypeSymbol classDeclarationSymbol,
-            ClassDeclarationSyntax sourceDeclaration)
-        {
-            return sourceDeclaration.Members;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Diagnostics/DiagnosticDescriptors.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Diagnostics/DiagnosticDescriptors.cs
deleted file mode 100644
index 52ab2c33079..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Diagnostics/DiagnosticDescriptors.cs
+++ /dev/null
@@ -1,224 +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.ComponentModel;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics
-{
-    /// <summary>
-    /// A container for all <see cref="DiagnosticDescriptor"/> instances for errors reported by analyzers in this project.
-    /// </summary>
-    internal static class DiagnosticDescriptors
-    {
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when <see cref="INotifyPropertyChangedGenerator"/> failed to run on a given type.
-        /// <para>
-        /// Format: <c>"The generator INotifyPropertyChangedGenerator failed to execute on type {0}"</c>.
-        /// </para>
-        /// </summary>
-        public static readonly DiagnosticDescriptor INotifyPropertyChangedGeneratorError = new(
-            id: "MVVMTK0001",
-            title: $"Internal error for {nameof(INotifyPropertyChangedGenerator)}",
-            messageFormat: $"The generator {nameof(INotifyPropertyChangedGenerator)} failed to execute on type {{0}}",
-            category: typeof(INotifyPropertyChangedGenerator).FullName,
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: $"The {nameof(INotifyPropertyChangedGenerator)} generator encountered an error while processing a type. Please report this issue at https://aka.ms/mvvmtoolkit.",
-            helpLinkUri: "https://aka.ms/mvvmtoolkit");
-
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when <see cref="ObservableObjectGenerator"/> failed to run on a given type.
-        /// <para>
-        /// Format: <c>"The generator ObservableObjectGenerator failed to execute on type {0}"</c>.
-        /// </para>
-        /// </summary>
-        public static readonly DiagnosticDescriptor ObservableObjectGeneratorError = new(
-            id: "MVVMTK0002",
-            title: $"Internal error for {nameof(ObservableObjectGenerator)}",
-            messageFormat: $"The generator {nameof(ObservableObjectGenerator)} failed to execute on type {{0}}",
-            category: typeof(ObservableObjectGenerator).FullName,
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: $"The {nameof(ObservableObjectGenerator)} generator encountered an error while processing a type. Please report this issue at https://aka.ms/mvvmtoolkit.",
-            helpLinkUri: "https://aka.ms/mvvmtoolkit");
-
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when <see cref="ObservableRecipientGenerator"/> failed to run on a given type.
-        /// <para>
-        /// Format: <c>"The generator ObservableRecipientGenerator failed to execute on type {0}"</c>.
-        /// </para>
-        /// </summary>
-        public static readonly DiagnosticDescriptor ObservableRecipientGeneratorError = new(
-            id: "MVVMTK0003",
-            title: $"Internal error for {nameof(ObservableRecipientGenerator)}",
-            messageFormat: $"The generator {nameof(ObservableRecipientGenerator)} failed to execute on type {{0}}",
-            category: typeof(ObservableRecipientGenerator).FullName,
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: $"The {nameof(ObservableRecipientGenerator)} generator encountered an error while processing a type. Please report this issue at https://aka.ms/mvvmtoolkit.",
-            helpLinkUri: "https://aka.ms/mvvmtoolkit");
-
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when a duplicate declaration of <see cref="INotifyPropertyChanged"/> would happen.
-        /// <para>
-        /// Format: <c>"Cannot apply [INotifyPropertyChangedAttribute] to type {0}, as it already declares the INotifyPropertyChanged interface"</c>.
-        /// </para>
-        /// </summary>
-        public static readonly DiagnosticDescriptor DuplicateINotifyPropertyChangedInterfaceForINotifyPropertyChangedAttributeError = new(
-            id: "MVVMTK0004",
-            title: $"Duplicate {nameof(INotifyPropertyChanged)} definition",
-            messageFormat: $"Cannot apply [INotifyPropertyChanged] to type {{0}}, as it already declares the {nameof(INotifyPropertyChanged)} interface",
-            category: typeof(INotifyPropertyChangedGenerator).FullName,
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: $"Cannot apply [INotifyPropertyChanged] to a type that already declares the {nameof(INotifyPropertyChanged)} interface.",
-            helpLinkUri: "https://aka.ms/mvvmtoolkit");
-
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when a duplicate declaration of <see cref="INotifyPropertyChanged"/> would happen.
-        /// <para>
-        /// Format: <c>"Cannot apply [ObservableObjectAttribute] to type {0}, as it already declares the INotifyPropertyChanged interface"</c>.
-        /// </para>
-        /// </summary>
-        public static readonly DiagnosticDescriptor DuplicateINotifyPropertyChangedInterfaceForObservableObjectAttributeError = new(
-            id: "MVVMTK0005",
-            title: $"Duplicate {nameof(INotifyPropertyChanged)} definition",
-            messageFormat: $"Cannot apply [ObservableObject] to type {{0}}, as it already declares the {nameof(INotifyPropertyChanged)} interface",
-            category: typeof(ObservableObjectGenerator).FullName,
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: $"Cannot apply [ObservableObject] to a type that already declares the {nameof(INotifyPropertyChanged)} interface.",
-            helpLinkUri: "https://aka.ms/mvvmtoolkit");
-
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when a duplicate declaration of <see cref="INotifyPropertyChanging"/> would happen.
-        /// <para>
-        /// Format: <c>"Cannot apply [ObservableObjectAttribute] to type {0}, as it already declares the INotifyPropertyChanging interface"</c>.
-        /// </para>
-        /// </summary>
-        public static readonly DiagnosticDescriptor DuplicateINotifyPropertyChangingInterfaceForObservableObjectAttributeError = new(
-            id: "MVVMTK0006",
-            title: $"Duplicate {nameof(INotifyPropertyChanging)} definition",
-            messageFormat: $"Cannot apply [ObservableObject] to type {{0}}, as it already declares the {nameof(INotifyPropertyChanging)} interface",
-            category: typeof(ObservableObjectGenerator).FullName,
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: $"Cannot apply [ObservableObject] to a type that already declares the {nameof(INotifyPropertyChanging)} interface.",
-            helpLinkUri: "https://aka.ms/mvvmtoolkit");
-
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when a duplicate declaration of <see cref="INotifyPropertyChanging"/> would happen.
-        /// <para>
-        /// Format: <c>"Cannot apply [ObservableRecipientAttribute] to type {0}, as it already inherits from the ObservableRecipient class"</c>.
-        /// </para>
-        /// </summary>
-        public static readonly DiagnosticDescriptor DuplicateObservableRecipientError = new(
-            id: "MVVMTK0007",
-            title: "Duplicate ObservableRecipient definition",
-            messageFormat: $"Cannot apply [ObservableRecipient] to type {{0}}, as it already inherits from the ObservableRecipient class",
-            category: typeof(ObservableRecipientGenerator).FullName,
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: $"Cannot apply [ObservableRecipient] to a type that already inherits from the ObservableRecipient class.",
-            helpLinkUri: "https://aka.ms/mvvmtoolkit");
-
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when there is a missing base functionality to enable <c>ObservableRecipientAttribute</c>.
-        /// <para>
-        /// Format: <c>"Cannot apply [ObservableRecipientAttribute] to type {0}, as it lacks necessary base functionality (it should either inherit from ObservableObject, or be annotated with [ObservableObjectAttribute] or [INotifyPropertyChangedAttribute])"</c>.
-        /// </para>
-        /// </summary>
-        public static readonly DiagnosticDescriptor MissingBaseObservableObjectFunctionalityError = new(
-            id: "MVVMTK0008",
-            title: "Missing base ObservableObject functionality",
-            messageFormat: $"Cannot apply [ObservableRecipient] to type {{0}}, as it lacks necessary base functionality (it should either inherit from ObservableObject, or be annotated with [ObservableObject] or [INotifyPropertyChanged])",
-            category: typeof(ObservableRecipientGenerator).FullName,
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: $"Cannot apply [ObservableRecipient] to a type that lacks necessary base functionality (it should either inherit from ObservableObject, or be annotated with [ObservableObject] or [INotifyPropertyChanged]).",
-            helpLinkUri: "https://aka.ms/mvvmtoolkit");
-
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when the target type doesn't inherit from the <c>ObservableValidator</c> class.
-        /// <para>
-        /// Format: <c>"The field {0}.{1} cannot be used to generate an observable property, as it has {2} validation attribute(s) but is declared in a type that doesn't inherit from ObservableValidator"</c>.
-        /// </para>
-        /// </summary>
-        public static readonly DiagnosticDescriptor MissingObservableValidatorInheritanceError = new(
-            id: "MVVMTK0009",
-            title: "Missing ObservableValidator inheritance",
-            messageFormat: "The field {0}.{1} cannot be used to generate an observable property, as it has {2} validation attribute(s) but is declared in a type that doesn't inherit from ObservableValidator",
-            category: typeof(ObservablePropertyGenerator).FullName,
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: $"Cannot apply [ObservableProperty] to fields with validation attributes if they are declared in a type that doesn't inherit from ObservableValidator.",
-            helpLinkUri: "https://aka.ms/mvvmtoolkit");
-
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when <see cref="ObservablePropertyGenerator"/> failed to run on a given type.
-        /// <para>
-        /// Format: <c>"The generator ObservablePropertyGenerator failed to execute on type {0}"</c>.
-        /// </para>
-        /// </summary>
-        public static readonly DiagnosticDescriptor ObservablePropertyGeneratorError = new(
-            id: "MVVMTK0010",
-            title: $"Internal error for {nameof(ObservablePropertyGenerator)}",
-            messageFormat: $"The generator {nameof(ObservablePropertyGenerator)} failed to execute on type {{0}}",
-            category: typeof(ObservableObjectGenerator).FullName,
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: $"The {nameof(ObservablePropertyGenerator)} generator encountered an error while processing a type. Please report this issue at https://aka.ms/mvvmtoolkit.",
-            helpLinkUri: "https://aka.ms/mvvmtoolkit");
-
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when <see cref="ICommandGenerator"/> failed to run on a given type.
-        /// <para>
-        /// Format: <c>"The generator ICommandGenerator failed to execute on type {0}"</c>.
-        /// </para>
-        /// </summary>
-        public static readonly DiagnosticDescriptor ICommandGeneratorError = new(
-            id: "MVVMTK0011",
-            title: $"Internal error for {nameof(ICommandGenerator)}",
-            messageFormat: $"The generator {nameof(ICommandGenerator)} failed to execute on type {{0}}",
-            category: typeof(ICommandGenerator).FullName,
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: $"The {nameof(ICommandGenerator)} generator encountered an error while processing a type. Please report this issue at https://aka.ms/mvvmtoolkit.",
-            helpLinkUri: "https://aka.ms/mvvmtoolkit");
-
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when an annotated method to generate a command for has an invalid signature.
-        /// <para>
-        /// Format: <c>"The method {0}.{1} cannot be used to generate a command property, as its signature isn't compatible with any of the existing relay command types"</c>.
-        /// </para>
-        /// </summary>
-        public static readonly DiagnosticDescriptor InvalidICommandMethodSignatureError = new(
-            id: "MVVMTK0012",
-            title: "Invalid ICommand method signature",
-            messageFormat: "The method {0}.{1} cannot be used to generate a command property, as its signature isn't compatible with any of the existing relay command types",
-            category: typeof(ICommandGenerator).FullName,
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: "Cannot apply [ICommand] to methods with a signature that doesn't match any of the existing relay command types.",
-            helpLinkUri: "https://aka.ms/mvvmtoolkit");
-
-        /// <summary>
-        /// Gets a <see cref="DiagnosticDescriptor"/> indicating when an unsupported C# language version is being used.
-        /// <para>
-        /// Format: <c>"The method {0}.{1} cannot be used to generate a command property, as its signature isn't compatible with any of the existing relay command types"</c>.
-        /// </para>
-        /// </summary>
-        public static readonly DiagnosticDescriptor UnsupportedCSharpLanguageVersionError = new(
-            id: "MVVMTK0013",
-            title: "Unsupported C# language version",
-            messageFormat: "The source generator features from the MVVM Toolkit require consuming projects to set the C# language version to at least C# 9.0",
-            category: typeof(CSharpParseOptions).FullName,
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: "The source generator features from the MVVM Toolkit require consuming projects to set the C# language version to at least C# 9.0. Make sure to add <LangVersion>9.0</LangVersion> (or above) to your .csproj file.",
-            helpLinkUri: "https://aka.ms/mvvmtoolkit");
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Diagnostics/DiagnosticExtensions.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Diagnostics/DiagnosticExtensions.cs
deleted file mode 100644
index 5e7e6830f88..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Diagnostics/DiagnosticExtensions.cs
+++ /dev/null
@@ -1,47 +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.CodeAnalysis;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics
-{
-    /// <summary>
-    /// Extension methods for <see cref="GeneratorExecutionContext"/>, specifically for reporting diagnostics.
-    /// </summary>
-    internal static class DiagnosticExtensions
-    {
-        /// <summary>
-        /// Adds a new diagnostics to the current compilation.
-        /// </summary>
-        /// <param name="context">The <see cref="GeneratorEditContext"/> instance currently in use.</param>
-        /// <param name="descriptor">The input <see cref="DiagnosticDescriptor"/> for the diagnostics to create.</param>
-        /// <param name="symbol">The source <see cref="ISymbol"/> to attach the diagnostics to.</param>
-        /// <param name="args">The optional arguments for the formatted message to include.</param>
-        public static void ReportDiagnostic(
-            this GeneratorExecutionContext context,
-            DiagnosticDescriptor descriptor,
-            ISymbol symbol,
-            params object[] args)
-        {
-            context.ReportDiagnostic(Diagnostic.Create(descriptor, symbol.Locations.FirstOrDefault(), args));
-        }
-
-        /// <summary>
-        /// Adds a new diagnostics to the current compilation.
-        /// </summary>
-        /// <param name="context">The <see cref="GeneratorEditContext"/> instance currently in use.</param>
-        /// <param name="descriptor">The input <see cref="DiagnosticDescriptor"/> for the diagnostics to create.</param>
-        /// <param name="node">The source <see cref="SyntaxNode"/> to attach the diagnostics to.</param>
-        /// <param name="args">The optional arguments for the formatted message to include.</param>
-        public static void ReportDiagnostic(
-            this GeneratorExecutionContext context,
-            DiagnosticDescriptor descriptor,
-            SyntaxNode node,
-            params object[] args)
-        {
-            context.ReportDiagnostic(Diagnostic.Create(descriptor, node.GetLocation(), args));
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/EmbeddedResources/INotifyPropertyChanged.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/EmbeddedResources/INotifyPropertyChanged.cs
deleted file mode 100644
index 3f9a4a7c8e7..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/EmbeddedResources/INotifyPropertyChanged.cs
+++ /dev/null
@@ -1,497 +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.
-
-#pragma warning disable
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.Mvvm.ComponentModel
-{
-    /// <summary>
-    /// A base class for objects implementing <see cref="INotifyPropertyChanged"/>.
-    /// </summary>
-    public abstract class NotifyPropertyChanged : INotifyPropertyChanged
-    {
-        /// <inheritdoc cref="INotifyPropertyChanged.PropertyChanged"/>
-        public event PropertyChangedEventHandler? PropertyChanged;
-
-        /// <summary>
-        /// Raises the <see cref="PropertyChanged"/> event.
-        /// </summary>
-        /// <param name="e">The input <see cref="PropertyChangedEventArgs"/> instance.</param>
-        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
-        {
-            PropertyChanged?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Raises the <see cref="PropertyChanged"/> event.
-        /// </summary>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
-        {
-            OnPropertyChanged(new PropertyChangedEventArgs(propertyName));
-        }
-
-        /// <summary>
-        /// Compares the current and new values for a given property. If the value has changed, 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="PropertyChanged"/> event is not raised if the current and new value for the target property are the same.
-        /// </remarks>
-        protected bool SetProperty<T>([NotNullIfNotNull("newValue")] ref T field, T newValue, [CallerMemberName] string? propertyName = null)
-        {
-            if (EqualityComparer<T>.Default.Equals(field, newValue))
-            {
-                return false;
-            }
-
-            field = newValue;
-
-            OnPropertyChanged(propertyName);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Compares the current and new values for a given property. If the value has changed, updates
-        /// the property with the new value, then raises the <see cref="PropertyChanged"/> event.
-        /// 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>
-        /// <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 SetProperty<T>([NotNullIfNotNull("newValue")] ref T field, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string? propertyName = null)
-        {
-            if (comparer.Equals(field, newValue))
-            {
-                return false;
-            }
-
-            field = newValue;
-
-            OnPropertyChanged(propertyName);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Compares the current and new values for a given property. If the value has changed, updates
-        /// the property with the new value, then raises the <see cref="PropertyChanged"/> event.
-        /// 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>
-        /// <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="PropertyChanged"/> event is 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)
-        {
-            if (EqualityComparer<T>.Default.Equals(oldValue, newValue))
-            {
-                return false;
-            }
-
-            callback(newValue);
-
-            OnPropertyChanged(propertyName);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Compares the current and new values for a given property. If the value has changed, updates
-        /// the property with the new value, then raises the <see cref="PropertyChanged"/> event.
-        /// 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>
-        /// <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 SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, [CallerMemberName] string? propertyName = null)
-        {
-            if (comparer.Equals(oldValue, newValue))
-            {
-                return false;
-            }
-
-            callback(newValue);
-
-            OnPropertyChanged(propertyName);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Compares the current and new values for a given nested property. If the value has changed,
-        /// 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. 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 the properties of that model, like so:
-        /// <code>
-        /// [INotifyPropertyChanged]
-        /// public partial class BindablePerson
-        /// {
-        ///     public Model { get; }
-        ///
-        ///     public BindablePerson(Person model)
-        ///     {
-        ///         Model = model;
-        ///     }
-        ///
-        ///     public string Name
-        ///     {
-        ///         get => Model.Name;
-        ///         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)"/>, 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="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 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>
-        /// <remarks>
-        /// The <see cref="PropertyChanged"/> event is not 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))
-            {
-                return false;
-            }
-
-            callback(model, newValue);
-
-            OnPropertyChanged(propertyName);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Compares the current and new values for a given nested property. If the value has changed,
-        /// 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{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="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</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>
-        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))
-            {
-                return false;
-            }
-
-            callback(model, newValue);
-
-            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, 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"/> 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"/>
-        /// 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 myTask;
-        ///
-        /// public Task MyTask
-        /// {
-        ///     get => myTask;
-        ///     private set => SetAndNotifyOnCompletion(ref myTask, value);
-        /// }
-        /// </code>
-        /// </summary>
-        /// <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="PropertyChanged"/> event is 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"/> instance passed as argument is in any particular state.
-        /// </remarks>
-        protected bool SetPropertyAndNotifyOnCompletion([NotNull] ref TaskNotifier? taskNotifier, Task? newValue, [CallerMemberName] string? propertyName = null)
-        {
-            return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new(), newValue, static _ => { }, 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, updates the field and then raises the <see cref="PropertyChanged"/> event.
-        /// 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>
-        /// <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="PropertyChanged"/> event is not raised if the current and new value for the target property are the same.
-        /// </remarks>
-        protected bool SetPropertyAndNotifyOnCompletion([NotNull] ref TaskNotifier? taskNotifier, Task? newValue, Action<Task?> callback, [CallerMemberName] string? propertyName = null)
-        {
-            return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new(), 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, 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="PropertyChanged"/> event is 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>([NotNull] ref TaskNotifier<T>? taskNotifier, Task<T>? newValue, [CallerMemberName] string? propertyName = null)
-        {
-            return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new(), newValue, static _ => { }, 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, 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="PropertyChanged"/> event is not raised if the current and new value for the target property are the same.
-        /// </remarks>
-        protected bool SetPropertyAndNotifyOnCompletion<T>([NotNull] ref TaskNotifier<T>? taskNotifier, Task<T>? newValue, Action<Task<T>?> callback, [CallerMemberName] string? propertyName = null)
-        {
-            return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new(), 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;
-            }
-
-            bool isAlreadyCompletedOrNull = newValue?.IsCompleted ?? true;
-
-            taskNotifier.Task = newValue;
-
-            OnPropertyChanged(propertyName);
-
-            if (isAlreadyCompletedOrNull)
-            {
-                callback(newValue);
-
-                return true;
-            }
-
-            async void MonitorTask()
-            {
-                try
-                {
-                    await newValue!;
-                }
-                catch
-                {
-                }
-
-                if (ReferenceEquals(taskNotifier.Task, newValue))
-                {
-                    OnPropertyChanged(propertyName);
-                }
-
-                callback(newValue);
-            }
-
-            MonitorTask();
-
-            return true;
-        }
-
-        /// <summary>
-        /// An interface for task notifiers of a specified type.
-        /// </summary>
-        /// <typeparam name="TTask">The type of value to store.</typeparam>
-        private interface ITaskNotifier<TTask>
-            where TTask : Task
-        {
-            /// <summary>
-            /// Gets or sets the wrapped <typeparamref name="TTask"/> value.
-            /// </summary>
-            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()
-            {
-            }
-
-            private Task? task;
-
-            /// <inheritdoc/>
-            Task? ITaskNotifier<Task>.Task
-            {
-                get => this.task;
-                set => this.task = value;
-            }
-
-            /// <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 notifier?.task;
-            }
-        }
-
-        /// <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>
-            /// Initializes a new instance of the <see cref="TaskNotifier{TTask}"/> class.
-            /// </summary>
-            internal TaskNotifier()
-            {
-            }
-
-            private Task<T>? task;
-
-            /// <inheritdoc/>
-            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.
-            /// </summary>
-            /// <param name="notifier">The input <see cref="TaskNotifier{TTask}"/> instance.</param>
-            public static implicit operator Task<T>?(TaskNotifier<T>? notifier)
-            {
-                return notifier?.task;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Extensions/AttributeDataExtensions.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Extensions/AttributeDataExtensions.cs
deleted file mode 100644
index 93f9ac9f1d4..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Extensions/AttributeDataExtensions.cs
+++ /dev/null
@@ -1,118 +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.Contracts;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions
-{
-    /// <summary>
-    /// Extension methods for the <see cref="AttributeData"/> type.
-    /// </summary>
-    internal static class AttributeDataExtensions
-    {
-        /// <summary>
-        /// Checks whether a given <see cref="AttributeData"/> instance contains a specified named argument.
-        /// </summary>
-        /// <typeparam name="T">The type of argument to check.</typeparam>
-        /// <param name="attributeData">The target <see cref="AttributeData"/> instance to check.</param>
-        /// <param name="name">The name of the argument to check.</param>
-        /// <param name="value">The expected value for the target named argument.</param>
-        /// <returns>Whether or not <paramref name="attributeData"/> contains an argument named <paramref name="name"/> with the expected value.</returns>
-        [Pure]
-        public static bool HasNamedArgument<T>(this AttributeData attributeData, string name, T? value)
-        {
-            foreach (KeyValuePair<string, TypedConstant> properties in attributeData.NamedArguments)
-            {
-                if (properties.Key == name)
-                {
-                    return
-                        properties.Value.Value is T argumentValue &&
-                        EqualityComparer<T?>.Default.Equals(argumentValue, value);
-                }
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Creates an <see cref="AttributeSyntax"/> node that is equivalent to the input <see cref="AttributeData"/> instance.
-        /// </summary>
-        /// <param name="attributeData">The input <see cref="AttributeData"/> instance to process.</param>
-        /// <returns>An <see cref="AttributeSyntax"/> replicating the data in <paramref name="attributeData"/>.</returns>
-        [Pure]
-        public static AttributeSyntax AsAttributeSyntax(this AttributeData attributeData)
-        {
-            IdentifierNameSyntax attributeType = IdentifierName(attributeData.AttributeClass!.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat));
-            AttributeArgumentSyntax[] arguments =
-                attributeData.ConstructorArguments
-                .Select(static arg => AttributeArgument(ToExpression(arg))).Concat(
-                    attributeData.NamedArguments
-                    .Select(static arg =>
-                        AttributeArgument(ToExpression(arg.Value))
-                        .WithNameEquals(NameEquals(IdentifierName(arg.Key))))).ToArray();
-
-            return Attribute(attributeType, AttributeArgumentList(SeparatedList(SeparatedList(arguments))));
-
-            static ExpressionSyntax ToExpression(TypedConstant arg)
-            {
-                if (arg.IsNull)
-                {
-                    return LiteralExpression(SyntaxKind.NullLiteralExpression);
-                }
-
-                if (arg.Kind == TypedConstantKind.Array)
-                {
-                    string elementType = ((IArrayTypeSymbol)arg.Type!).ElementType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
-
-                    return
-                        ArrayCreationExpression(
-                        ArrayType(IdentifierName(elementType))
-                        .AddRankSpecifiers(ArrayRankSpecifier(SingletonSeparatedList<ExpressionSyntax>(OmittedArraySizeExpression()))))
-                        .WithInitializer(InitializerExpression(SyntaxKind.ArrayInitializerExpression)
-                        .AddExpressions(arg.Values.Select(ToExpression).ToArray()));
-                }
-
-                switch ((arg.Kind, arg.Value))
-                {
-                    case (TypedConstantKind.Primitive, string text):
-                        return LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(text));
-                    case (TypedConstantKind.Primitive, bool flag) when flag:
-                        return LiteralExpression(SyntaxKind.TrueLiteralExpression);
-                    case (TypedConstantKind.Primitive, bool):
-                        return LiteralExpression(SyntaxKind.FalseLiteralExpression);
-                    case (TypedConstantKind.Primitive, object value):
-                        return LiteralExpression(SyntaxKind.NumericLiteralExpression, value switch
-                        {
-                            byte b => Literal(b),
-                            char c => Literal(c),
-                            double d => Literal(d),
-                            float f => Literal(f),
-                            int i => Literal(i),
-                            long l => Literal(l),
-                            sbyte sb => Literal(sb),
-                            short sh => Literal(sh),
-                            uint ui => Literal(ui),
-                            ulong ul => Literal(ul),
-                            ushort ush => Literal(ush),
-                            _ => throw new ArgumentException()
-                        });
-                    case (TypedConstantKind.Type, ITypeSymbol type):
-                        return TypeOfExpression(IdentifierName(type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)));
-                    case (TypedConstantKind.Enum, object value):
-                        return CastExpression(
-                            IdentifierName(arg.Type!.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)),
-                            LiteralExpression(SyntaxKind.NumericLiteralExpression, ParseToken(value.ToString())));
-                    default: throw new ArgumentException();
-                }
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Extensions/INamedTypeSymbolExtensions.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Extensions/INamedTypeSymbolExtensions.cs
deleted file mode 100644
index e04728d019c..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Extensions/INamedTypeSymbolExtensions.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.Diagnostics.Contracts;
-using System.Text;
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions
-{
-    /// <summary>
-    /// Extension methods for the <see cref="INamedTypeSymbol"/> type.
-    /// </summary>
-    internal static class INamedTypeSymbolExtensions
-    {
-        /// <summary>
-        /// Gets the full metadata name for a given <see cref="INamedTypeSymbol"/> instance.
-        /// </summary>
-        /// <param name="symbol">The input <see cref="INamedTypeSymbol"/> instance.</param>
-        /// <returns>The full metadata name for <paramref name="symbol"/>.</returns>
-        [Pure]
-        public static string GetFullMetadataName(this INamedTypeSymbol symbol)
-        {
-            static StringBuilder BuildFrom(ISymbol? symbol, StringBuilder builder)
-            {
-                return symbol switch
-                {
-                    INamespaceSymbol ns when ns.IsGlobalNamespace => builder,
-                    INamespaceSymbol ns when ns.ContainingNamespace is { IsGlobalNamespace: false }
-                        => BuildFrom(ns.ContainingNamespace, builder.Insert(0, $".{ns.MetadataName}")),
-                    ITypeSymbol ts when ts.ContainingType is ISymbol pt => BuildFrom(pt, builder.Insert(0, $"+{ts.MetadataName}")),
-                    ITypeSymbol ts when ts.ContainingNamespace is ISymbol pn => BuildFrom(pn, builder.Insert(0, $".{ts.MetadataName}")),
-                    ISymbol => BuildFrom(symbol.ContainingSymbol, builder.Insert(0, symbol.MetadataName)),
-                    _ => builder
-                };
-            }
-
-            return BuildFrom(symbol, new StringBuilder(256)).ToString();
-        }
-
-        /// <summary>
-        /// Gets a valid filename for a given <see cref="INamedTypeSymbol"/> instance.
-        /// </summary>
-        /// <param name="symbol">The input <see cref="INamedTypeSymbol"/> instance.</param>
-        /// <returns>The full metadata name for <paramref name="symbol"/> that is also a valid filename.</returns>
-        [Pure]
-        public static string GetFullMetadataNameForFileName(this INamedTypeSymbol symbol)
-        {
-            return symbol.GetFullMetadataName().Replace('`', '-').Replace('+', '.');
-        }
-
-        /// <summary>
-        /// Checks whether or not a given <see cref="INamedTypeSymbol"/> inherits from a specified type.
-        /// </summary>
-        /// <param name="typeSymbol">The target <see cref="INamedTypeSymbol"/> instance to check.</param>
-        /// <param name="targetTypeSymbol">The type symbol of the type to check for inheritance.</param>
-        /// <returns>Whether or not <paramref name="typeSymbol"/> inherits from <paramref name="targetTypeSymbol"/>.</returns>
-        [Pure]
-        public static bool InheritsFrom(this INamedTypeSymbol typeSymbol, INamedTypeSymbol targetTypeSymbol)
-        {
-            INamedTypeSymbol? baseType = typeSymbol.BaseType;
-
-            while (baseType != null)
-            {
-                if (SymbolEqualityComparer.Default.Equals(baseType, targetTypeSymbol))
-                {
-                    return true;
-                }
-
-                baseType = baseType.BaseType;
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Extensions/MemberDeclarationSyntaxExtensions.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Extensions/MemberDeclarationSyntaxExtensions.cs
deleted file mode 100644
index cdc63118306..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Extensions/MemberDeclarationSyntaxExtensions.cs
+++ /dev/null
@@ -1,57 +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.Diagnostics.Contracts;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions
-{
-    /// <summary>
-    /// Extension methods for the <see cref="MemberDeclarationSyntax"/> type.
-    /// </summary>
-    internal static class MemberDeclarationSyntaxExtensions
-    {
-        /// <summary>
-        /// Replaces a specific modifier.
-        /// </summary>
-        /// <param name="memberDeclaration">The input <see cref="MemberDeclarationSyntax"/> instance.</param>
-        /// <param name="oldKind">The target modifier kind to replace.</param>
-        /// <param name="newKind">The new modifier kind to add or replace.</param>
-        /// <returns>A <see cref="MemberDeclarationSyntax"/> instance with the target modifier.</returns>
-        [Pure]
-        public static MemberDeclarationSyntax ReplaceModifier(this MemberDeclarationSyntax memberDeclaration, SyntaxKind oldKind, SyntaxKind newKind)
-        {
-            int index = memberDeclaration.Modifiers.IndexOf(oldKind);
-
-            if (index != -1)
-            {
-                return memberDeclaration.WithModifiers(memberDeclaration.Modifiers.Replace(memberDeclaration.Modifiers[index], Token(newKind)));
-            }
-
-            return memberDeclaration;
-        }
-
-        /// <summary>
-        /// Removes a specific modifier.
-        /// </summary>
-        /// <param name="memberDeclaration">The input <see cref="MemberDeclarationSyntax"/> instance.</param>
-        /// <param name="kind">The modifier kind to remove.</param>
-        /// <returns>A <see cref="MemberDeclarationSyntax"/> instance without the specified modifier.</returns>
-        [Pure]
-        public static MemberDeclarationSyntax RemoveModifier(this MemberDeclarationSyntax memberDeclaration, SyntaxKind kind)
-        {
-            int index = memberDeclaration.Modifiers.IndexOf(kind);
-
-            if (index != -1)
-            {
-                return memberDeclaration.WithModifiers(memberDeclaration.Modifiers.RemoveAt(index));
-            }
-
-            return memberDeclaration;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.SyntaxReceiver.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.SyntaxReceiver.cs
deleted file mode 100644
index 5e365a90b97..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.SyntaxReceiver.cs
+++ /dev/null
@@ -1,51 +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.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <inheritdoc cref="ICommandGenerator"/>
-    public sealed partial class ICommandGenerator
-    {
-        /// <summary>
-        /// An <see cref="ISyntaxContextReceiver"/> that selects candidate nodes to process.
-        /// </summary>
-        private sealed class SyntaxReceiver : ISyntaxContextReceiver
-        {
-            /// <summary>
-            /// The list of info gathered during exploration.
-            /// </summary>
-            private readonly List<Item> gatheredInfo = new();
-
-            /// <summary>
-            /// Gets the collection of gathered info to process.
-            /// </summary>
-            public IReadOnlyCollection<Item> GatheredInfo => this.gatheredInfo;
-
-            /// <inheritdoc/>
-            public void OnVisitSyntaxNode(GeneratorSyntaxContext context)
-            {
-                if (context.Node is MethodDeclarationSyntax methodDeclaration &&
-                    context.SemanticModel.GetDeclaredSymbol(methodDeclaration) is IMethodSymbol methodSymbol &&
-                    context.SemanticModel.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Input.ICommandAttribute") is INamedTypeSymbol iCommandSymbol &&
-                    methodSymbol.GetAttributes().Any(a => SymbolEqualityComparer.Default.Equals(a.AttributeClass, iCommandSymbol)))
-                {
-                    this.gatheredInfo.Add(new Item(methodDeclaration.GetLeadingTrivia(), methodSymbol));
-                }
-            }
-
-            /// <summary>
-            /// A model for a group of item representing a discovered type to process.
-            /// </summary>
-            /// <param name="LeadingTrivia">The leading trivia for the field declaration.</param>
-            /// <param name="MethodSymbol">The <see cref="IMethodSymbol"/> instance for the target method.</param>
-            public sealed record Item(SyntaxTriviaList LeadingTrivia, IMethodSymbol MethodSymbol);
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.cs
deleted file mode 100644
index 9095f93f36c..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.cs
+++ /dev/null
@@ -1,346 +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.CodeAnalysis;
-using System.Diagnostics.Contracts;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics;
-using Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions;
-using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
-using static Microsoft.CodeAnalysis.SymbolDisplayTypeQualificationStyle;
-using static Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics.DiagnosticDescriptors;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <summary>
-    /// A source generator for generating command properties from annotated methods.
-    /// </summary>
-    [Generator]
-    public sealed partial class ICommandGenerator : ISourceGenerator
-    {
-        /// <inheritdoc/>
-        public void Initialize(GeneratorInitializationContext context)
-        {
-            context.RegisterForSyntaxNotifications(static () => new SyntaxReceiver());
-        }
-
-        /// <inheritdoc/>
-        public void Execute(GeneratorExecutionContext context)
-        {
-            // Get the syntax receiver with the candidate nodes
-            if (context.SyntaxContextReceiver is not SyntaxReceiver syntaxReceiver ||
-                syntaxReceiver.GatheredInfo.Count == 0)
-            {
-                return;
-            }
-
-            // Validate the language version
-            if (context.ParseOptions is not CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp9 })
-            {
-                context.ReportDiagnostic(Diagnostic.Create(UnsupportedCSharpLanguageVersionError, null));
-            }
-
-            foreach (var items in syntaxReceiver.GatheredInfo.GroupBy<SyntaxReceiver.Item, INamedTypeSymbol>(static item => item.MethodSymbol.ContainingType, SymbolEqualityComparer.Default))
-            {
-                if (items.Key.DeclaringSyntaxReferences.Length > 0 &&
-                    items.Key.DeclaringSyntaxReferences.First().GetSyntax() is ClassDeclarationSyntax classDeclaration)
-                {
-                    try
-                    {
-                        OnExecute(context, classDeclaration, items.Key, items);
-                    }
-                    catch
-                    {
-                        context.ReportDiagnostic(ICommandGeneratorError, classDeclaration, items.Key);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Processes a given target type.
-        /// </summary>
-        /// <param name="context">The input <see cref="GeneratorExecutionContext"/> instance to use.</param>
-        /// <param name="classDeclaration">The <see cref="ClassDeclarationSyntax"/> node to process.</param>
-        /// <param name="classDeclarationSymbol">The <see cref="INamedTypeSymbol"/> for <paramref name="classDeclaration"/>.</param>
-        /// <param name="items">The sequence of <see cref="IMethodSymbol"/> instances to process.</param>
-        private static void OnExecute(
-            GeneratorExecutionContext context,
-            ClassDeclarationSyntax classDeclaration,
-            INamedTypeSymbol classDeclarationSymbol,
-            IEnumerable<SyntaxReceiver.Item> items)
-        {
-            // Create the class declaration for the user type. This will produce a tree as follows:
-            //
-            // <MODIFIERS> <CLASS_NAME>
-            // {
-            //     <MEMBERS>
-            // }
-            var classDeclarationSyntax =
-                ClassDeclaration(classDeclarationSymbol.Name)
-                .WithModifiers(classDeclaration.Modifiers)
-                .AddMembers(items.Select(item => CreateCommandMembers(context, item.LeadingTrivia, item.MethodSymbol)).SelectMany(static g => g).ToArray());
-
-            TypeDeclarationSyntax typeDeclarationSyntax = classDeclarationSyntax;
-
-            // Add all parent types in ascending order, if any
-            foreach (var parentType in classDeclaration.Ancestors().OfType<TypeDeclarationSyntax>())
-            {
-                typeDeclarationSyntax = parentType
-                    .WithMembers(SingletonList<MemberDeclarationSyntax>(typeDeclarationSyntax))
-                    .WithConstraintClauses(List<TypeParameterConstraintClauseSyntax>())
-                    .WithBaseList(null)
-                    .WithAttributeLists(List<AttributeListSyntax>())
-                    .WithoutTrivia();
-            }
-
-            // Create the compilation unit with the namespace and target member.
-            // From this, we can finally generate the source code to output.
-            var namespaceName = classDeclarationSymbol.ContainingNamespace.ToDisplayString(new(typeQualificationStyle: NameAndContainingTypesAndNamespaces));
-
-            // Create the final compilation unit to generate (with leading trivia)
-            var source =
-                CompilationUnit().AddMembers(
-                NamespaceDeclaration(IdentifierName(namespaceName)).WithLeadingTrivia(TriviaList(
-                    Comment("// Licensed to the .NET Foundation under one or more agreements."),
-                    Comment("// The .NET Foundation licenses this file to you under the MIT license."),
-                    Comment("// See the LICENSE file in the project root for more information."),
-                    Trivia(PragmaWarningDirectiveTrivia(Token(SyntaxKind.DisableKeyword), true))))
-                .AddMembers(typeDeclarationSyntax))
-                .NormalizeWhitespace()
-                .ToFullString();
-
-            // Add the partial type
-            context.AddSource($"{classDeclarationSymbol.GetFullMetadataNameForFileName()}.cs", SourceText.From(source, Encoding.UTF8));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="MemberDeclarationSyntax"/> instances for a specified command.
-        /// </summary>
-        /// <param name="context">The input <see cref="GeneratorExecutionContext"/> instance to use.</param>
-        /// <param name="leadingTrivia">The leading trivia for the field to process.</param>
-        /// <param name="methodSymbol">The input <see cref="IMethodSymbol"/> instance to process.</param>
-        /// <returns>The <see cref="MemberDeclarationSyntax"/> instances for the input command.</returns>
-        [Pure]
-        private static IEnumerable<MemberDeclarationSyntax> CreateCommandMembers(GeneratorExecutionContext context, SyntaxTriviaList leadingTrivia, IMethodSymbol methodSymbol)
-        {
-            // Get the command member names
-            var (fieldName, propertyName) = GetGeneratedFieldAndPropertyNames(context, methodSymbol);
-
-            // Get the command type symbols
-            if (!TryMapCommandTypesFromMethod(
-                context,
-                methodSymbol,
-                out ITypeSymbol? commandInterfaceTypeSymbol,
-                out ITypeSymbol? commandClassTypeSymbol,
-                out ITypeSymbol? delegateTypeSymbol))
-            {
-                context.ReportDiagnostic(InvalidICommandMethodSignatureError, methodSymbol, methodSymbol.ContainingType, methodSymbol);
-
-                return Array.Empty<MemberDeclarationSyntax>();
-            }
-
-            // Construct the generated field as follows:
-            //
-            // [global::System.CodeDom.Compiler.GeneratedCode("...", "...")]
-            // private <COMMAND_TYPE>? <COMMAND_FIELD_NAME>;
-            FieldDeclarationSyntax fieldDeclaration =
-                FieldDeclaration(
-                VariableDeclaration(NullableType(IdentifierName(commandClassTypeSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat))))
-                .AddVariables(VariableDeclarator(Identifier(fieldName))))
-                .AddModifiers(Token(SyntaxKind.PrivateKeyword))
-                .AddAttributeLists(AttributeList(SingletonSeparatedList(
-                    Attribute(IdentifierName("global::System.CodeDom.Compiler.GeneratedCode"))
-                    .AddArgumentListArguments(
-                        AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(ICommandGenerator).FullName))),
-                        AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(ICommandGenerator).Assembly.GetName().Version.ToString())))))));
-
-            SyntaxTriviaList summaryTrivia = SyntaxTriviaList.Empty;
-
-            // Parse the <summary> docs, if present
-            foreach (SyntaxTrivia trivia in leadingTrivia)
-            {
-                if (trivia.IsKind(SyntaxKind.SingleLineCommentTrivia) ||
-                    trivia.IsKind(SyntaxKind.SingleLineDocumentationCommentTrivia))
-                {
-                    string text = trivia.ToString();
-
-                    Match match = Regex.Match(text, @"<summary>.*?<\/summary>", RegexOptions.Singleline);
-
-                    if (match.Success)
-                    {
-                        summaryTrivia = TriviaList(Comment($"/// {match.Value}"));
-
-                        break;
-                    }
-                }
-            }
-
-            // Construct the generated property as follows (the explicit delegate cast is needed to avoid overload resolution conflicts):
-            //
-            // <METHOD_SUMMARY>
-            // [global::System.CodeDom.Compiler.GeneratedCode("...", "...")]
-            // [global::System.Diagnostics.DebuggerNonUserCode]
-            // [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-            // public <COMMAND_TYPE> <COMMAND_PROPERTY_NAME> => <COMMAND_FIELD_NAME> ??= new <RELAY_COMMAND_TYPE>(new <DELEGATE_TYPE>(<METHOD_NAME>));
-            PropertyDeclarationSyntax propertyDeclaration =
-                PropertyDeclaration(
-                    IdentifierName(commandInterfaceTypeSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)),
-                    Identifier(propertyName))
-                .AddModifiers(Token(SyntaxKind.PublicKeyword))
-                .AddAttributeLists(
-                    AttributeList(SingletonSeparatedList(
-                        Attribute(IdentifierName("global::System.CodeDom.Compiler.GeneratedCode"))
-                        .AddArgumentListArguments(
-                            AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(ICommandGenerator).FullName))),
-                            AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(typeof(ICommandGenerator).Assembly.GetName().Version.ToString()))))))
-                    .WithOpenBracketToken(Token(summaryTrivia, SyntaxKind.OpenBracketToken, TriviaList())),
-                    AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.DebuggerNonUserCode")))),
-                    AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage")))))
-                .WithExpressionBody(
-                    ArrowExpressionClause(
-                        AssignmentExpression(
-                            SyntaxKind.CoalesceAssignmentExpression,
-                            IdentifierName(fieldName),
-                            ObjectCreationExpression(IdentifierName(commandClassTypeSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)))
-                            .AddArgumentListArguments(Argument(
-                                ObjectCreationExpression(IdentifierName(delegateTypeSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)))
-                                .AddArgumentListArguments(Argument(IdentifierName(methodSymbol.Name))))))))
-                .WithSemicolonToken(Token(SyntaxKind.SemicolonToken));
-
-            return new MemberDeclarationSyntax[] { fieldDeclaration, propertyDeclaration };
-        }
-
-        /// <summary>
-        /// Get the generated field and property names for the input method.
-        /// </summary>
-        /// <param name="context">The input <see cref="GeneratorExecutionContext"/> instance to use.</param>
-        /// <param name="methodSymbol">The input <see cref="IMethodSymbol"/> instance to process.</param>
-        /// <returns>The generated field and property names for <paramref name="methodSymbol"/>.</returns>
-        [Pure]
-        private static (string FieldName, string PropertyName) GetGeneratedFieldAndPropertyNames(GeneratorExecutionContext context, IMethodSymbol methodSymbol)
-        {
-            string propertyName = methodSymbol.Name;
-
-            if (SymbolEqualityComparer.Default.Equals(methodSymbol.ReturnType, context.Compilation.GetTypeByMetadataName("System.Threading.Tasks.Task")) &&
-                methodSymbol.Name.EndsWith("Async"))
-            {
-                propertyName = propertyName.Substring(0, propertyName.Length - "Async".Length);
-            }
-
-            propertyName += "Command";
-
-            string fieldName = $"{char.ToLower(propertyName[0])}{propertyName.Substring(1)}";
-
-            return (fieldName, propertyName);
-        }
-
-        /// <summary>
-        /// Gets the type symbols for the input method, if supported.
-        /// </summary>
-        /// <param name="context">The input <see cref="GeneratorExecutionContext"/> instance to use.</param>
-        /// <param name="methodSymbol">The input <see cref="IMethodSymbol"/> instance to process.</param>
-        /// <param name="commandInterfaceTypeSymbol">The command interface type symbol.</param>
-        /// <param name="commandClassTypeSymbol">The command class type symbol.</param>
-        /// <param name="delegateTypeSymbol">The delegate type symbol for the wrapped method.</param>
-        /// <returns>Whether or not <paramref name="methodSymbol"/> was valid and the requested types have been set.</returns>
-        private static bool TryMapCommandTypesFromMethod(
-            GeneratorExecutionContext context,
-            IMethodSymbol methodSymbol,
-            [NotNullWhen(true)] out ITypeSymbol? commandInterfaceTypeSymbol,
-            [NotNullWhen(true)] out ITypeSymbol? commandClassTypeSymbol,
-            [NotNullWhen(true)] out ITypeSymbol? delegateTypeSymbol)
-        {
-            // Map <void, void> to IRelayCommand, RelayCommand, Action
-            if (methodSymbol.ReturnsVoid && methodSymbol.Parameters.Length == 0)
-            {
-                commandInterfaceTypeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Input.IRelayCommand")!;
-                commandClassTypeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Input.RelayCommand")!;
-                delegateTypeSymbol = context.Compilation.GetTypeByMetadataName("System.Action")!;
-
-                return true;
-            }
-
-            // Map <T, void> to IRelayCommand<T>, RelayCommand<T>, Action<T>
-            if (methodSymbol.ReturnsVoid &&
-                methodSymbol.Parameters.Length == 1 &&
-                methodSymbol.Parameters[0] is IParameterSymbol { RefKind: RefKind.None, Type: { IsRefLikeType: false, TypeKind: not TypeKind.Pointer and not TypeKind.FunctionPointer } } parameter)
-            {
-                commandInterfaceTypeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Input.IRelayCommand`1")!.Construct(parameter.Type);
-                commandClassTypeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Input.RelayCommand`1")!.Construct(parameter.Type);
-                delegateTypeSymbol = context.Compilation.GetTypeByMetadataName("System.Action`1")!.Construct(parameter.Type);
-
-                return true;
-            }
-
-            if (SymbolEqualityComparer.Default.Equals(methodSymbol.ReturnType, context.Compilation.GetTypeByMetadataName("System.Threading.Tasks.Task")!))
-            {
-                // Map <void, Task> to IAsyncRelayCommand, AsyncRelayCommand, Func<Task>
-                if (methodSymbol.Parameters.Length == 0)
-                {
-                    commandInterfaceTypeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Input.IAsyncRelayCommand")!;
-                    commandClassTypeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Input.AsyncRelayCommand")!;
-                    delegateTypeSymbol = context.Compilation.GetTypeByMetadataName("System.Func`1")!.Construct(context.Compilation.GetTypeByMetadataName("System.Threading.Tasks.Task")!);
-
-                    return true;
-                }
-
-                if (methodSymbol.Parameters.Length == 1 &&
-                    methodSymbol.Parameters[0] is IParameterSymbol { RefKind: RefKind.None, Type: { IsRefLikeType: false, TypeKind: not TypeKind.Pointer and not TypeKind.FunctionPointer } } singleParameter)
-                {
-                    // Map <CancellationToken, Task> to IAsyncRelayCommand, AsyncRelayCommand, Func<CancellationToken, Task>
-                    if (SymbolEqualityComparer.Default.Equals(singleParameter.Type, context.Compilation.GetTypeByMetadataName("System.Threading.CancellationToken")!))
-                    {
-                        commandInterfaceTypeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Input.IAsyncRelayCommand")!;
-                        commandClassTypeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Input.AsyncRelayCommand")!;
-                        delegateTypeSymbol = context.Compilation.GetTypeByMetadataName("System.Func`2")!.Construct(
-                            context.Compilation.GetTypeByMetadataName("System.Threading.CancellationToken")!,
-                            context.Compilation.GetTypeByMetadataName("System.Threading.Tasks.Task")!);
-
-                        return true;
-                    }
-
-                    // Map <T, Task> to IAsyncRelayCommand<T>, AsyncRelayCommand<T>, Func<T, Task>
-                    commandInterfaceTypeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Input.IAsyncRelayCommand`1")!.Construct(singleParameter.Type);
-                    commandClassTypeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Input.AsyncRelayCommand`1")!.Construct(singleParameter.Type);
-                    delegateTypeSymbol = context.Compilation.GetTypeByMetadataName("System.Func`2")!.Construct(
-                        singleParameter.Type,
-                        context.Compilation.GetTypeByMetadataName("System.Threading.Tasks.Task")!);
-
-                    return true;
-                }
-
-                // Map <T, CancellationToken, Task> to IAsyncRelayCommand<T>, AsyncRelayCommand<T>, Func<T, CancellationToken, Task>
-                if (methodSymbol.Parameters.Length == 2 &&
-                    methodSymbol.Parameters[0] is IParameterSymbol { RefKind: RefKind.None, Type: { IsRefLikeType: false, TypeKind: not TypeKind.Pointer and not TypeKind.FunctionPointer } } firstParameter &&
-                    methodSymbol.Parameters[1] is IParameterSymbol { RefKind: RefKind.None, Type: { IsRefLikeType: false, TypeKind: not TypeKind.Pointer and not TypeKind.FunctionPointer } } secondParameter &&
-                    SymbolEqualityComparer.Default.Equals(secondParameter.Type, context.Compilation.GetTypeByMetadataName("System.Threading.CancellationToken")!))
-                {
-                    commandInterfaceTypeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Input.IAsyncRelayCommand`1")!.Construct(firstParameter.Type);
-                    commandClassTypeSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Input.AsyncRelayCommand`1")!.Construct(firstParameter.Type);
-                    delegateTypeSymbol = context.Compilation.GetTypeByMetadataName("System.Func`3")!.Construct(
-                        firstParameter.Type,
-                        secondParameter.Type,
-                        context.Compilation.GetTypeByMetadataName("System.Threading.Tasks.Task")!);
-
-                    return true;
-                }
-            }
-
-            commandInterfaceTypeSymbol = null;
-            commandClassTypeSymbol = null;
-            delegateTypeSymbol = null;
-
-            return false;
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.SyntaxReceiver.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.SyntaxReceiver.cs
deleted file mode 100644
index 979cfb8f492..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.SyntaxReceiver.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.Collections.Generic;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <inheritdoc cref="IMessengerRegisterAllGenerator"/>
-    public sealed partial class IMessengerRegisterAllGenerator
-    {
-        /// <summary>
-        /// An <see cref="ISyntaxContextReceiver"/> that selects candidate nodes to process.
-        /// </summary>
-        private sealed class SyntaxReceiver : ISyntaxContextReceiver
-        {
-            /// <summary>
-            /// The list of info gathered during exploration.
-            /// </summary>
-            private readonly List<INamedTypeSymbol> gatheredInfo = new();
-
-            /// <summary>
-            /// Gets the collection of gathered info to process.
-            /// </summary>
-            public IReadOnlyCollection<INamedTypeSymbol> GatheredInfo => this.gatheredInfo;
-
-            /// <inheritdoc/>
-            public void OnVisitSyntaxNode(GeneratorSyntaxContext context)
-            {
-                if (context.Node is ClassDeclarationSyntax classDeclaration &&
-                    context.SemanticModel.GetDeclaredSymbol(classDeclaration) is INamedTypeSymbol { IsGenericType: false } classSymbol &&
-                    context.SemanticModel.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Messaging.IRecipient`1") is INamedTypeSymbol iRecipientSymbol &&
-                    classSymbol.AllInterfaces.Any(i => SymbolEqualityComparer.Default.Equals(i.OriginalDefinition, iRecipientSymbol)))
-                {
-                    this.gatheredInfo.Add(classSymbol);
-                }
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.cs
deleted file mode 100644
index 10eb7f1a865..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.cs
+++ /dev/null
@@ -1,292 +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.Contracts;
-using System.Linq;
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions;
-using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
-using static Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics.DiagnosticDescriptors;
-
-namespace Microsoft.Toolkit.Mvvm.SourceGenerators
-{
-    /// <summary>
-    /// A source generator for message registration without relying on compiled LINQ expressions.
-    /// </summary>
-    [Generator]
-    public sealed partial class IMessengerRegisterAllGenerator : ISourceGenerator
-    {
-        /// <inheritdoc/>
-        public void Initialize(GeneratorInitializationContext context)
-        {
-            context.RegisterForSyntaxNotifications(static () => new SyntaxReceiver());
-        }
-
-        /// <inheritdoc/>
-        public void Execute(GeneratorExecutionContext context)
-        {
-            // Get the syntax receiver with the candidate nodes
-            if (context.SyntaxContextReceiver is not SyntaxReceiver syntaxReceiver ||
-                syntaxReceiver.GatheredInfo.Count == 0)
-            {
-                return;
-            }
-
-            // Like in the ObservableValidator.ValidateALlProperties generator, execution is skipped if C# >= 8.0 isn't available
-            if (context.ParseOptions is not CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp8 })
-            {
-                return;
-            }
-
-            // Get the symbol for the IRecipient<T> interface type
-            INamedTypeSymbol iRecipientSymbol = context.Compilation.GetTypeByMetadataName("Microsoft.Toolkit.Mvvm.Messaging.IRecipient`1")!;
-
-            // Prepare the attributes to add to the first class declaration
-            AttributeListSyntax[] classAttributes = new[]
-            {
-                AttributeList(SingletonSeparatedList(
-                    Attribute(IdentifierName($"global::System.CodeDom.Compiler.GeneratedCode"))
-                    .AddArgumentListArguments(
-                        AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(GetType().FullName))),
-                        AttributeArgument(LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(GetType().Assembly.GetName().Version.ToString())))))),
-                AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.DebuggerNonUserCode")))),
-                AttributeList(SingletonSeparatedList(Attribute(IdentifierName("global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage")))),
-                AttributeList(SingletonSeparatedList(
-                    Attribute(IdentifierName("global::System.ComponentModel.EditorBrowsable")).AddArgumentListArguments(
-                    AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never"))))),
-                AttributeList(SingletonSeparatedList(
-                    Attribute(IdentifierName("global::System.Obsolete")).AddArgumentListArguments(
-                    AttributeArgument(LiteralExpression(
-                        SyntaxKind.StringLiteralExpression,
-                        Literal("This type is not intended to be used directly by user code"))))))
-            };
-
-            foreach (INamedTypeSymbol classSymbol in syntaxReceiver.GatheredInfo)
-            {
-                // Create a static factory method to register all messages for a given recipient type.
-                // This follows the same pattern used in ObservableValidatorValidateAllPropertiesGenerator,
-                // with the same advantages mentioned there (type safety, more AOT-friendly, etc.).
-                // There are two versions that are generated: a non-generic one doing the registration
-                // with no tokens, which is the most common scenario and will help particularly in AOT
-                // scenarios, and a generic version that will support all other cases with custom tokens.
-                // Note: the generic overload has a different name to simplify the lookup with reflection.
-                // This code takes a class symbol and produces a compilation unit as follows:
-                //
-                // // 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
-                //
-                // namespace Microsoft.Toolkit.Mvvm.Messaging.__Internals
-                // {
-                //     [global::System.CodeDom.Compiler.GeneratedCode("...", "...")]
-                //     [global::System.Diagnostics.DebuggerNonUserCode]
-                //     [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-                //     [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-                //     [global::System.Obsolete("This type is not intended to be used directly by user code")]
-                //     internal static partial class __IMessengerExtensions
-                //     {
-                //         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-                //         [global::System.Obsolete("This method is not intended to be called directly by user code")]
-                //         public static global::System.Action<IMessenger, object> CreateAllMessagesRegistrator(<RECIPIENT_TYPE> _)
-                //         {
-                //             static void RegisterAll(IMessenger messenger, object obj)
-                //             {
-                //                 var recipient = (<INSTANCE_TYPE>)obj;
-                //                 <BODY>
-                //             }
-                //
-                //             return RegisterAll;
-                //         }
-                //
-                //         [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
-                //         [global::System.Obsolete("This method is not intended to be called directly by user code")]
-                //         public static global::System.Action<IMessenger, object, TToken> CreateAllMessagesRegistratorWithToken<TToken>(<RECIPIENT_TYPE> _)
-                //             where TToken : global::System.IEquatable<TToken>
-                //         {
-                //             static void RegisterAll(IMessenger messenger, object obj, TToken token)
-                //             {
-                //                 var recipient = (<INSTANCE_TYPE>)obj;
-                //                 <BODY>
-                //             }
-                //
-                //             return RegisterAll;
-                //         }
-                //     }
-                // }
-                var source =
-                    CompilationUnit().AddMembers(
-                    NamespaceDeclaration(IdentifierName("Microsoft.Toolkit.Mvvm.Messaging.__Internals")).WithLeadingTrivia(TriviaList(
-                        Comment("// Licensed to the .NET Foundation under one or more agreements."),
-                        Comment("// The .NET Foundation licenses this file to you under the MIT license."),
-                        Comment("// See the LICENSE file in the project root for more information."),
-                        Trivia(PragmaWarningDirectiveTrivia(Token(SyntaxKind.DisableKeyword), true)))).AddMembers(
-                    ClassDeclaration("__IMessengerExtensions").AddModifiers(
-                        Token(SyntaxKind.InternalKeyword),
-                        Token(SyntaxKind.StaticKeyword),
-                        Token(SyntaxKind.PartialKeyword)).AddAttributeLists(classAttributes).AddMembers(
-                    MethodDeclaration(
-                        GenericName("global::System.Action").AddTypeArgumentListArguments(
-                            IdentifierName("IMessenger"),
-                            PredefinedType(Token(SyntaxKind.ObjectKeyword))),
-                        Identifier("CreateAllMessagesRegistrator")).AddAttributeLists(
-                            AttributeList(SingletonSeparatedList(
-                                Attribute(IdentifierName("global::System.ComponentModel.EditorBrowsable")).AddArgumentListArguments(
-                                AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never"))))),
-                            AttributeList(SingletonSeparatedList(
-                                Attribute(IdentifierName("global::System.Obsolete")).AddArgumentListArguments(
-                                AttributeArgument(LiteralExpression(
-                                    SyntaxKind.StringLiteralExpression,
-                                    Literal("This method is not intended to be called directly by user code"))))))).AddModifiers(
-                        Token(SyntaxKind.PublicKeyword),
-                        Token(SyntaxKind.StaticKeyword)).AddParameterListParameters(
-                            Parameter(Identifier("_")).WithType(IdentifierName(classSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat))))
-                        .WithBody(Block(
-                            LocalFunctionStatement(
-                                PredefinedType(Token(SyntaxKind.VoidKeyword)),
-                                Identifier("RegisterAll"))
-                            .AddModifiers(Token(SyntaxKind.StaticKeyword))
-                            .AddParameterListParameters(
-                                Parameter(Identifier("messenger")).WithType(IdentifierName("IMessenger")),
-                                Parameter(Identifier("obj")).WithType(PredefinedType(Token(SyntaxKind.ObjectKeyword))))
-                            .WithBody(Block(
-                                LocalDeclarationStatement(
-                                    VariableDeclaration(IdentifierName("var"))
-                                    .AddVariables(
-                                        VariableDeclarator(Identifier("recipient"))
-                                        .WithInitializer(EqualsValueClause(
-                                            CastExpression(
-                                                IdentifierName(classSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)),
-                                                IdentifierName("obj")))))))
-                                .AddStatements(EnumerateRegistrationStatements(classSymbol, iRecipientSymbol).ToArray())),
-                            ReturnStatement(IdentifierName("RegisterAll")))),
-                    MethodDeclaration(
-                        GenericName("global::System.Action").AddTypeArgumentListArguments(
-                            IdentifierName("IMessenger"),
-                            PredefinedType(Token(SyntaxKind.ObjectKeyword)),
-                            IdentifierName("TToken")),
-                        Identifier("CreateAllMessagesRegistratorWithToken")).AddAttributeLists(
-                            AttributeList(SingletonSeparatedList(
-                                Attribute(IdentifierName("global::System.ComponentModel.EditorBrowsable")).AddArgumentListArguments(
-                                AttributeArgument(ParseExpression("global::System.ComponentModel.EditorBrowsableState.Never"))))),
-                            AttributeList(SingletonSeparatedList(
-                                Attribute(IdentifierName("global::System.Obsolete")).AddArgumentListArguments(
-                                AttributeArgument(LiteralExpression(
-                                    SyntaxKind.StringLiteralExpression,
-                                    Literal("This method is not intended to be called directly by user code"))))))).AddModifiers(
-                        Token(SyntaxKind.PublicKeyword),
-                        Token(SyntaxKind.StaticKeyword)).AddParameterListParameters(
-                            Parameter(Identifier("_")).WithType(IdentifierName(classSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat))))
-                        .AddTypeParameterListParameters(TypeParameter("TToken"))
-                        .AddConstraintClauses(
-                            TypeParameterConstraintClause("TToken")
-                            .AddConstraints(TypeConstraint(GenericName("global::System.IEquatable").AddTypeArgumentListArguments(IdentifierName("TToken")))))
-                        .WithBody(Block(
-                            LocalFunctionStatement(
-                                PredefinedType(Token(SyntaxKind.VoidKeyword)),
-                                Identifier("RegisterAll"))
-                            .AddModifiers(Token(SyntaxKind.StaticKeyword))
-                            .AddParameterListParameters(
-                                Parameter(Identifier("messenger")).WithType(IdentifierName("IMessenger")),
-                                Parameter(Identifier("obj")).WithType(PredefinedType(Token(SyntaxKind.ObjectKeyword))),
-                                Parameter(Identifier("token")).WithType(IdentifierName("TToken")))
-                            .WithBody(Block(
-                                LocalDeclarationStatement(
-                                    VariableDeclaration(IdentifierName("var"))
-                                    .AddVariables(
-                                        VariableDeclarator(Identifier("recipient"))
-                                        .WithInitializer(EqualsValueClause(
-                                            CastExpression(
-                                                IdentifierName(classSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)),
-                                                IdentifierName("obj")))))))
-                                .AddStatements(EnumerateRegistrationStatementsWithTokens(classSymbol, iRecipientSymbol).ToArray())),
-                            ReturnStatement(IdentifierName("RegisterAll")))))))
-                    .NormalizeWhitespace()
-                    .ToFullString();
-
-                // Reset the attributes list (so the same class doesn't get duplicate attributes)
-                classAttributes = Array.Empty<AttributeListSyntax>();
-
-                // Add the partial type
-                context.AddSource($"{classSymbol.GetFullMetadataNameForFileName()}.cs", SourceText.From(source, Encoding.UTF8));
-            }
-        }
-
-        /// <summary>
-        /// Gets a sequence of statements to register declared message handlers.
-        /// </summary>
-        /// <param name="classSymbol">The input <see cref="INamedTypeSymbol"/> instance to process.</param>
-        /// <param name="iRecipientSymbol">The type symbol for the <c>IRecipient&lt;T&gt;</c> interface.</param>
-        /// <returns>The sequence of <see cref="StatementSyntax"/> instances to register message handleers.</returns>
-        [Pure]
-        private static IEnumerable<StatementSyntax> EnumerateRegistrationStatements(INamedTypeSymbol classSymbol, INamedTypeSymbol iRecipientSymbol)
-        {
-            foreach (var interfaceSymbol in classSymbol.AllInterfaces)
-            {
-                if (!SymbolEqualityComparer.Default.Equals(interfaceSymbol.OriginalDefinition, iRecipientSymbol))
-                {
-                    continue;
-                }
-
-                // This enumerator produces a sequence of statements as follows:
-                //
-                // messenger.Register<<TYPE_0>>(recipient);
-                // messenger.Register<<TYPE_1>>(recipient);
-                // ...
-                // messenger.Register<<TYPE_N>>(recipient);
-                yield return
-                    ExpressionStatement(
-                        InvocationExpression(
-                            MemberAccessExpression(
-                                SyntaxKind.SimpleMemberAccessExpression,
-                                IdentifierName("messenger"),
-                                GenericName(Identifier("Register")).AddTypeArgumentListArguments(
-                                    IdentifierName(interfaceSymbol.TypeArguments[0].ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)))))
-                        .AddArgumentListArguments(Argument(IdentifierName("recipient"))));
-            }
-        }
-
-        /// <summary>
-        /// Gets a sequence of statements to register declared message handlers with custom tokens.
-        /// </summary>
-        /// <param name="classSymbol">The input <see cref="INamedTypeSymbol"/> instance to process.</param>
-        /// <param name="iRecipientSymbol">The type symbol for the <c>IRecipient&lt;T&gt;</c> interface.</param>
-        /// <returns>The sequence of <see cref="StatementSyntax"/> instances to register message handleers.</returns>
-        [Pure]
-        private static IEnumerable<StatementSyntax> EnumerateRegistrationStatementsWithTokens(INamedTypeSymbol classSymbol, INamedTypeSymbol iRecipientSymbol)
-        {
-            foreach (var interfaceSymbol in classSymbol.AllInterfaces)
-            {
-                if (!SymbolEqualityComparer.Default.Equals(interfaceSymbol.OriginalDefinition, iRecipientSymbol))
-                {
-                    continue;
-                }
-
-                // This enumerator produces a sequence of statements as follows:
-                //
-                // messenger.Register<<TYPE_0>, TToken>(recipient, token);
-                // messenger.Register<<TYPE_1>, TToken>(recipient, token);
-                // ...
-                // messenger.Register<<TYPE_N>, TToken>(recipient, token);
-                yield return
-                    ExpressionStatement(
-                        InvocationExpression(
-                            MemberAccessExpression(
-                                SyntaxKind.SimpleMemberAccessExpression,
-                                IdentifierName("messenger"),
-                                GenericName(Identifier("Register")).AddTypeArgumentListArguments(
-                                    IdentifierName(interfaceSymbol.TypeArguments[0].ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)),
-                                    IdentifierName("TToken"))))
-                        .AddArgumentListArguments(Argument(IdentifierName("recipient")), Argument(IdentifierName("token"))));
-            }
-        }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/Microsoft.Toolkit.Mvvm.SourceGenerators.csproj b/Microsoft.Toolkit.Mvvm.SourceGenerators/Microsoft.Toolkit.Mvvm.SourceGenerators.csproj
deleted file mode 100644
index fa2804b3282..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/Microsoft.Toolkit.Mvvm.SourceGenerators.csproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="EmbeddedResources\INotifyPropertyChanged.cs" />
-    <Compile Remove="EmbeddedResources\NotNullAttribute.cs" />
-    <Compile Remove="EmbeddedResources\NotNullIfNotNullAttribute.cs" />
-    <Compile Remove="EmbeddedResources\ObservableObject.cs" />
-    <Compile Remove="EmbeddedResources\ObservableRecipient.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="EmbeddedResources\INotifyPropertyChanged.cs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Mvvm\Attributes\NotNullAttribute.cs" Link="EmbeddedResources\NotNullAttribute.cs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Mvvm\Attributes\NotNullIfNotNullAttribute.cs" Link="EmbeddedResources\NotNullIfNotNullAttribute.cs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Mvvm\ComponentModel\ObservableObject.cs" Link="EmbeddedResources\ObservableObject.cs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-    <EmbeddedResource Include="..\Microsoft.Toolkit.Mvvm\ComponentModel\ObservableRecipient.cs" Link="EmbeddedResources\ObservableRecipient.cs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" PrivateAssets="all" Pack="false" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <AdditionalFiles Include="AnalyzerReleases.Shipped.md" />
-    <AdditionalFiles Include="AnalyzerReleases.Unshipped.md" />
-  </ItemGroup>
-
-</Project>
diff --git a/Microsoft.Toolkit.Mvvm.SourceGenerators/System.Runtime.CompilerServices/IsExternalInit.cs b/Microsoft.Toolkit.Mvvm.SourceGenerators/System.Runtime.CompilerServices/IsExternalInit.cs
deleted file mode 100644
index cadcf5a8570..00000000000
--- a/Microsoft.Toolkit.Mvvm.SourceGenerators/System.Runtime.CompilerServices/IsExternalInit.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.
-
-using System.ComponentModel;
-
-namespace System.Runtime.CompilerServices
-{
-    /// <summary>
-    /// Reserved to be used by the compiler for tracking metadata.
-    /// This class should not be used by developers in source code.
-    /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    internal static class IsExternalInit
-    {
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Attributes/NotNullAttribute.cs b/Microsoft.Toolkit.Mvvm/Attributes/NotNullAttribute.cs
deleted file mode 100644
index 7725aeeeaf4..00000000000
--- a/Microsoft.Toolkit.Mvvm/Attributes/NotNullAttribute.cs
+++ /dev/null
@@ -1,20 +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.
-
-#if NETSTANDARD2_0
-
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Specifies that an output will not be null even if the corresponding type allows it.
-    /// Specifies that an input argument was not null when the call returns.
-    /// </summary>
-    /// <remarks>Internal copy from the BCL attribute.</remarks>
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, Inherited = false)]
-    internal sealed class NotNullAttribute : Attribute
-    {
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Attributes/NotNullIfNotNullAttribute.cs b/Microsoft.Toolkit.Mvvm/Attributes/NotNullIfNotNullAttribute.cs
deleted file mode 100644
index df828c4deec..00000000000
--- a/Microsoft.Toolkit.Mvvm/Attributes/NotNullIfNotNullAttribute.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.
-
-#if NETSTANDARD2_0
-
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Specifies that the output will be non-null if the named parameter is non-null.
-    /// </summary>
-    /// <remarks>Internal copy from the BCL attribute.</remarks>
-    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple = true, Inherited = false)]
-    internal sealed class NotNullIfNotNullAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotNullIfNotNullAttribute"/> class.
-        /// </summary>
-        /// <param name="parameterName"> The associated parameter name. The output will be non-null if the argument to the parameter specified is non-null.</param>
-        public NotNullIfNotNullAttribute(string parameterName) => ParameterName = parameterName;
-
-        /// <summary>Gets the associated parameter name.</summary>
-        public string ParameterName { get; }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Attributes/NotNullWhenAttribute.cs b/Microsoft.Toolkit.Mvvm/Attributes/NotNullWhenAttribute.cs
deleted file mode 100644
index 8b69958d2ca..00000000000
--- a/Microsoft.Toolkit.Mvvm/Attributes/NotNullWhenAttribute.cs
+++ /dev/null
@@ -1,29 +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.
-
-#if NETSTANDARD2_0
-
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Specifies that when a method returns <see cref="ReturnValue"/>, the parameter will not be null even if the corresponding type allows it.
-    /// </summary>
-    /// <remarks>Internal copy from the BCL attribute.</remarks>
-    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
-    internal sealed class NotNullWhenAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotNullWhenAttribute"/> class.
-        /// </summary>
-        /// <param name="returnValue">The return value condition. If the method returns this value, the associated parameter will not be null.</param>
-        public NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
-
-        /// <summary>
-        /// Gets a value indicating whether the annotated variable is not <see langword="null"/>.
-        /// </summary>
-        public bool ReturnValue { get; }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/AlsoNotifyChangeForAttribute.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/AlsoNotifyChangeForAttribute.cs
deleted file mode 100644
index 0eb967a4c32..00000000000
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/AlsoNotifyChangeForAttribute.cs
+++ /dev/null
@@ -1,100 +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;
-
-namespace Microsoft.Toolkit.Mvvm.ComponentModel
-{
-    /// <summary>
-    /// An attribute that can be used to support <see cref="ObservablePropertyAttribute"/> in generated properties. When this attribute is
-    /// used, the generated property setter will also call <see cref="ObservableObject.OnPropertyChanged(string?)"/> (or the equivalent
-    /// method in the target class) for the properties specified in the attribute data. This can be useful to keep the code compact when
-    /// there are one or more dependent properties that should also be reported as updated when the value of the annotated observable
-    /// property is changed. If this attribute is used in a field without <see cref="ObservablePropertyAttribute"/>, it is ignored.
-    /// <para>
-    /// In order to use this attribute, the containing type has to implement the <see cref="INotifyPropertyChanged"/> interface
-    /// and expose a method with the same signature as <see cref="ObservableObject.OnPropertyChanged(string?)"/>. If the containing
-    /// type also implements the <see cref="INotifyPropertyChanging"/> interface and exposes a method with the same signature as
-    /// <see cref="ObservableObject.OnPropertyChanging(string?)"/>, then this method will be invoked as well by the property setter.
-    /// </para>
-    /// <para>
-    /// This attribute can be used as follows:
-    /// <code>
-    /// partial class MyViewModel : ObservableObject
-    /// {
-    ///     [ObservableProperty]
-    ///     [AlsoNotifyChangeFor(nameof(FullName))]
-    ///     private string name;
-    ///
-    ///     [ObservableProperty]
-    ///     [AlsoNotifyChangeFor(nameof(FullName))]
-    ///     private string surname;
-    ///
-    ///     public string FullName => $"{Name} {Surname}";
-    /// }
-    /// </code>
-    /// </para>
-    /// And with this, code analogous to this will be generated:
-    /// <code>
-    /// partial class MyViewModel
-    /// {
-    ///     public string Name
-    ///     {
-    ///         get => name;
-    ///         set
-    ///         {
-    ///             if (SetProperty(ref name, value))
-    ///             {
-    ///                 OnPropertyChanged(nameof(FullName));
-    ///             }
-    ///         }
-    ///     }
-    ///
-    ///     public string Surname
-    ///     {
-    ///         get => surname;
-    ///         set
-    ///         {
-    ///             if (SetProperty(ref surname, value))
-    ///             {
-    ///                 OnPropertyChanged(nameof(FullName));
-    ///             }
-    ///         }
-    ///     }
-    /// }
-    /// </code>
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Field, AllowMultiple = true, Inherited = false)]
-    public sealed class AlsoNotifyChangeForAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AlsoNotifyChangeForAttribute"/> class.
-        /// </summary>
-        /// <param name="propertyName">The name of the property to also notify when the annotated property changes.</param>
-        public AlsoNotifyChangeForAttribute(string propertyName)
-        {
-            PropertyNames = new[] { propertyName };
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AlsoNotifyChangeForAttribute"/> class.
-        /// </summary>
-        /// <param name="propertyName">The name of the property to also notify when the annotated property changes.</param>
-        /// <param name="otherPropertyNames">
-        /// The other property names to also notify when the annotated property changes. This parameter can optionally
-        /// be used to indicate a series of dependent properties from the same attribute, to keep the code more compact.
-        /// </param>
-        public AlsoNotifyChangeForAttribute(string propertyName, params string[] otherPropertyNames)
-        {
-            PropertyNames = new[] { propertyName }.Concat(otherPropertyNames).ToArray();
-        }
-
-        /// <summary>
-        /// Gets the property names to also notify when the annotated property changes.
-        /// </summary>
-        public string[] PropertyNames { get; }
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/INotifyPropertyChangedAttribute.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/INotifyPropertyChangedAttribute.cs
deleted file mode 100644
index eef91ae0ef8..00000000000
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/INotifyPropertyChangedAttribute.cs
+++ /dev/null
@@ -1,38 +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.Mvvm.ComponentModel
-{
-    /// <summary>
-    /// An attribute that indicates that a given type should implement the <see cref="INotifyPropertyChanged"/> interface and
-    /// have minimal built-in functionality to support it. This includes exposing the necessary event and having two methods
-    /// to raise it that mirror <see cref="ObservableObject.OnPropertyChanged(PropertyChangedEventArgs)"/> and
-    /// <see cref="ObservableObject.OnPropertyChanged(string?)"/>. For more extensive support, use <see cref="ObservableObjectAttribute"/>.
-    /// <para>
-    /// This attribute can be used as follows:
-    /// <code>
-    /// [INotifyPropertyChanged]
-    /// partial class MyViewModel : SomeOtherClass
-    /// {
-    ///     // Other members here...
-    /// }
-    /// </code>
-    /// </para>
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
-    public sealed class INotifyPropertyChangedAttribute : Attribute
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether or not to also generate all the additional helper methods that are found
-        /// in <see cref="ObservableObject"/> as well (eg. <see cref="ObservableObject.SetProperty{T}(ref T, T, string?)"/>.
-        /// If set to <see langword="false"/>, only the <see cref="INotifyPropertyChanged.PropertyChanged"/> event and
-        /// the two <see cref="ObservableObject.OnPropertyChanged(PropertyChangedEventArgs)"/> overloads will be generated.
-        /// The default value is <see langword="true"/>.
-        /// </summary>
-        public bool IncludeAdditionalHelperMethods { get; set; } = true;
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/ObservableObjectAttribute.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/ObservableObjectAttribute.cs
deleted file mode 100644
index 72c4b078c85..00000000000
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/ObservableObjectAttribute.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.
-
-using System;
-using System.ComponentModel;
-
-namespace Microsoft.Toolkit.Mvvm.ComponentModel
-{
-    /// <summary>
-    /// An attribute that indicates that a given type should have all the members from <see cref="ObservableObject"/>
-    /// generated into it, as well as the <see cref="INotifyPropertyChanged"/> and <see cref="INotifyPropertyChanging"/>
-    /// interfaces. This can be useful when you want the same functionality from <see cref="ObservableObject"/> into a class
-    /// that already inherits from another one (since C# doesn't support multiple inheritance). This attribute will trigger
-    /// the source generator to just create the same APIs directly into the decorated class.
-    /// <para>
-    /// This attribute can be used as follows:
-    /// <code>
-    /// [ObservableObject]
-    /// partial class MyViewModel : SomeOtherClass
-    /// {
-    ///     // Other members here...
-    /// }
-    /// </code>
-    /// </para>
-    /// And with this, the same APIs from <see cref="ObservableObject"/> will be available on this type as well.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
-    public sealed class ObservableObjectAttribute : Attribute
-    {
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/ObservablePropertyAttribute.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/ObservablePropertyAttribute.cs
deleted file mode 100644
index 2395ec31ad9..00000000000
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/ObservablePropertyAttribute.cs
+++ /dev/null
@@ -1,57 +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.Mvvm.ComponentModel
-{
-    /// <summary>
-    /// An attribute that indicates that a given field should be wrapped by a generated observable property.
-    /// In order to use this attribute, the containing type has to implement the <see cref="INotifyPropertyChanged"/> interface
-    /// and expose a method with the same signature as <see cref="ObservableObject.OnPropertyChanged(string?)"/>. If the containing
-    /// type also implements the <see cref="INotifyPropertyChanging"/> interface and exposes a method with the same signature as
-    /// <see cref="ObservableObject.OnPropertyChanging(string?)"/>, then this method will be invoked as well by the property setter.
-    /// <para>
-    /// This attribute can be used as follows:
-    /// <code>
-    /// partial class MyViewModel : ObservableObject
-    /// {
-    ///     [ObservableProperty]
-    ///     private string name;
-    ///
-    ///     [ObservableProperty]
-    ///     private bool isEnabled;
-    /// }
-    /// </code>
-    /// </para>
-    /// And with this, code analogous to this will be generated:
-    /// <code>
-    /// partial class MyViewModel
-    /// {
-    ///     public string Name
-    ///     {
-    ///         get => name;
-    ///         set => SetProperty(ref name, value);
-    ///     }
-    ///
-    ///     public bool IsEnabled
-    ///     {
-    ///         get => name;
-    ///         set => SetProperty(ref isEnabled, value);
-    ///     }
-    /// }
-    /// </code>
-    /// </summary>
-    /// <remarks>
-    /// The generated properties will automatically use the <c>UpperCamelCase</c> format for their names,
-    /// which will be derived from the field names. The generator can also recognize fields using either
-    /// the <c>_lowerCamel</c> or <c>m_lowerCamel</c> naming scheme. Otherwise, the first character in the
-    /// source field name will be converted to uppercase (eg. <c>isEnabled</c> to <c>IsEnabled</c>).
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
-    public sealed class ObservablePropertyAttribute : Attribute
-    {
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/ObservableRecipientAttribute.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/ObservableRecipientAttribute.cs
deleted file mode 100644
index 382cce5c7e1..00000000000
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/Attributes/ObservableRecipientAttribute.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.Mvvm.ComponentModel
-{
-    /// <summary>
-    /// An attribute that indicates that a given type should have all the members from <see cref="ObservableRecipient"/>
-    /// generated into it. This can be useful when you want the same functionality from <see cref="ObservableRecipient"/> into
-    /// a class that already inherits from another one (since C# doesn't support multiple inheritance). This attribute will trigger
-    /// the source generator to just create the same APIs directly into the decorated class. For instance, this attribute can be
-    /// used to easily combine the functionality from both <see cref="ObservableValidator"/> and <see cref="ObservableRecipient"/>,
-    /// by using <see cref="ObservableValidator"/> as the base class and adding this attribute to the declared type.
-    /// <para>
-    /// This attribute can be used as follows:
-    /// <code>
-    /// [ObservableRecipient]
-    /// partial class MyViewModel : ObservableValidator
-    /// {
-    ///     // Other members here...
-    /// }
-    /// </code>
-    /// </para>
-    /// And with this, the same APIs from <see cref="ObservableRecipient"/> will be available on this type as well.
-    /// <para>
-    /// To avoid conflicts with other APIs in types where the new members are being generated, constructors are only generated when the annotated
-    /// type doesn't have any explicit constructors being declared. If that is the case, the same constructors from <see cref="ObservableRecipient"/>
-    /// are emitted, with the accessibility adapted to that of the annotated type. Otherwise, they are skipped, so the type being annotated has the
-    /// respondibility of properly initializing the <see cref="ObservableRecipient.Messenger"/> property. Additionally, if the annotated type inherits
-    /// from <see cref="ObservableValidator"/>, the <see cref="ObservableRecipient.SetProperty{T}(ref T, T, bool, string?)"/> overloads will be skipped
-    /// as well, as they would conflict with the <see cref="ObservableValidator.SetProperty{T}(ref T, T, bool, string?)"/> methods.
-    /// </para>
-    /// </summary>
-    /// <remarks>
-    /// In order to work, <see cref="ObservableRecipientAttribute"/> needs to be applied to a type that inherits from
-    /// <see cref="ObservableObject"/> (either directly or indirectly), or to one decorated with <see cref="ObservableObjectAttribute"/>.
-    /// This is because the <see cref="ObservableRecipient"/> methods rely on some of the inherited members to work.
-    /// If this condition is not met, the code will fail to build.
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
-    public sealed class ObservableRecipientAttribute : Attribute
-    {
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
deleted file mode 100644
index 41fa934cfd6..00000000000
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableObject.cs
+++ /dev/null
@@ -1,590 +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.
-
-#pragma warning disable SA1512
-
-// This file is inspired from the MvvmLight library (lbugnion/MvvmLight),
-// more info in ThirdPartyNotices.txt in the root of the project.
-
-// ================================== NOTE ==================================
-// This file is mirrored in the trimmed-down INotifyPropertyChanged file in
-// the source generator project, to be used with the [INotifyPropertyChanged],
-// attribute, along with the ObservableObject annotated copy (for debugging info).
-// If any changes are made to this file, they should also be appropriately
-// ported to that file as well to keep the behavior consistent.
-// ==========================================================================
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.Mvvm.ComponentModel
-{
-    /// <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.
-        /// </summary>
-        /// <param name="e">The input <see cref="PropertyChangedEventArgs"/> instance.</param>
-        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
-        {
-            PropertyChanged?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Raises the <see cref="PropertyChanging"/> event.
-        /// </summary>
-        /// <param name="e">The input <see cref="PropertyChangingEventArgs"/> instance.</param>
-        protected virtual void OnPropertyChanging(PropertyChangingEventArgs e)
-        {
-            PropertyChanging?.Invoke(this, e);
-        }
-
-        /// <summary>
-        /// Raises the <see cref="PropertyChanged"/> event.
-        /// </summary>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
-        {
-            OnPropertyChanged(new PropertyChangedEventArgs(propertyName));
-        }
-
-        /// <summary>
-        /// Raises the <see cref="PropertyChanging"/> event.
-        /// </summary>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        protected void OnPropertyChanging([CallerMemberName] string? propertyName = null)
-        {
-            OnPropertyChanging(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 SetProperty<T>([NotNullIfNotNull("newValue")] ref T field, T newValue, [CallerMemberName] string? propertyName = null)
-        {
-            // 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>
-        /// 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="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>
-        /// <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 SetProperty<T>([NotNullIfNotNull("newValue")] ref T field, T newValue, IEqualityComparer<T> comparer, [CallerMemberName] string? propertyName = null)
-        {
-            if (comparer.Equals(field, newValue))
-            {
-                return false;
-            }
-
-            OnPropertyChanging(propertyName);
-
-            field = newValue;
-
-            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.
-        /// 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>
-        /// <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 SetProperty<T>(T oldValue, T newValue, Action<T> callback, [CallerMemberName] string? propertyName = null)
-        {
-            // 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>
-        /// 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="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>
-        /// <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 SetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, [CallerMemberName] string? propertyName = null)
-        {
-            if (comparer.Equals(oldValue, newValue))
-            {
-                return false;
-            }
-
-            OnPropertyChanging(propertyName);
-
-            callback(newValue);
-
-            OnPropertyChanged(propertyName);
-
-            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="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).
-        /// 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 the properties 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, 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)"/>, 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="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 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>
-        /// <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 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))
-            {
-                return false;
-            }
-
-            OnPropertyChanging(propertyName);
-
-            callback(model, newValue);
-
-            OnPropertyChanged(propertyName);
-
-            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="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{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="comparer">The <see cref="IEqualityComparer{T}"/> instance to use to compare the input values.</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>
-        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))
-            {
-                return false;
-            }
-
-            OnPropertyChanging(propertyName);
-
-            callback(model, newValue);
-
-            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="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"/> 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"/>
-        /// 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 myTask;
-        ///
-        /// public Task MyTask
-        /// {
-        ///     get => myTask;
-        ///     private set => SetAndNotifyOnCompletion(ref myTask, value);
-        /// }
-        /// </code>
-        /// </summary>
-        /// <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"/> instance passed as argument is in any particular state.
-        /// </remarks>
-        protected bool SetPropertyAndNotifyOnCompletion([NotNull] 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
-            // 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 SetPropertyAndNotifyOnCompletion(taskNotifier ??= new(), newValue, static _ => { }, 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(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>
-        /// <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([NotNull] ref TaskNotifier? taskNotifier, Task? newValue, Action<Task?> callback, [CallerMemberName] string? propertyName = null)
-        {
-            return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new(), 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>([NotNull] ref TaskNotifier<T>? taskNotifier, Task<T>? newValue, [CallerMemberName] string? propertyName = null)
-        {
-            return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new(), newValue, static _ => { }, 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{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>([NotNull] ref TaskNotifier<T>? taskNotifier, Task<T>? newValue, Action<Task<T>?> callback, [CallerMemberName] string? propertyName = null)
-        {
-            return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new(), 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;
-            }
-
-            // 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;
-
-            OnPropertyChanging(propertyName);
-
-            taskNotifier.Task = newValue;
-
-            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)
-            {
-                callback(newValue);
-
-                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).
-            // 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!;
-                }
-                catch
-                {
-                }
-
-                // Only notify if the property hasn't changed
-                if (ReferenceEquals(taskNotifier.Task, newValue))
-                {
-                    OnPropertyChanged(propertyName);
-                }
-
-                callback(newValue);
-            }
-
-            MonitorTask();
-
-            return true;
-        }
-
-        /// <summary>
-        /// An interface for task notifiers of a specified type.
-        /// </summary>
-        /// <typeparam name="TTask">The type of value to store.</typeparam>
-        private interface ITaskNotifier<TTask>
-            where TTask : Task
-        {
-            /// <summary>
-            /// Gets or sets the wrapped <typeparamref name="TTask"/> value.
-            /// </summary>
-            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()
-            {
-            }
-
-            private Task? task;
-
-            /// <inheritdoc/>
-            Task? ITaskNotifier<Task>.Task
-            {
-                get => this.task;
-                set => this.task = value;
-            }
-
-            /// <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 notifier?.task;
-            }
-        }
-
-        /// <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>
-            /// Initializes a new instance of the <see cref="TaskNotifier{TTask}"/> class.
-            /// </summary>
-            internal TaskNotifier()
-            {
-            }
-
-            private Task<T>? task;
-
-            /// <inheritdoc/>
-            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.
-            /// </summary>
-            /// <param name="notifier">The input <see cref="TaskNotifier{TTask}"/> instance.</param>
-            public static implicit operator Task<T>?(TaskNotifier<T>? notifier)
-            {
-                return notifier?.task;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
deleted file mode 100644
index 23e0d0bb6bb..00000000000
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableRecipient.cs
+++ /dev/null
@@ -1,305 +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.
-
-#pragma warning disable SA1512
-
-// This file is inspired from the MvvmLight library (lbugnion/MvvmLight),
-// more info in ThirdPartyNotices.txt in the root of the project.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.Mvvm.Messaging;
-using Microsoft.Toolkit.Mvvm.Messaging.Messages;
-
-namespace Microsoft.Toolkit.Mvvm.ComponentModel
-{
-    /// <summary>
-    /// 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 ObservableRecipient : ObservableObject
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableRecipient"/> class.
-        /// </summary>
-        /// <remarks>
-        /// 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(WeakReferenceMessenger.Default)
-        {
-        }
-
-        /// <summary>
-        /// 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 ObservableRecipient(IMessenger messenger)
-        {
-            Messenger = messenger;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="IMessenger"/> instance in use.
-        /// </summary>
-        protected IMessenger Messenger { get; }
-
-        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 (SetProperty(ref this.isActive, value, true))
-                {
-                    if (value)
-                    {
-                        OnActivated();
-                    }
-                    else
-                    {
-                        OnDeactivated();
-                    }
-                }
-            }
-        }
-
-        /// <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>
-        /// <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="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>
-        protected virtual void OnActivated()
-        {
-            Messenger.RegisterAll(this);
-        }
-
-        /// <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. It does so by
-        /// 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.UnregisterAll(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)
-        {
-            PropertyChangedMessage<T> message = new(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.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 SetProperty<T>([NotNullIfNotNull("newValue")] ref T field, T newValue, bool broadcast, [CallerMemberName] string? propertyName = null)
-        {
-            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>
-        /// 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="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>([NotNullIfNotNull("newValue")] ref T field, T newValue, IEqualityComparer<T> comparer, bool broadcast, [CallerMemberName] string? propertyName = null)
-        {
-            T oldValue = field;
-
-            bool propertyChanged = SetProperty(ref field, newValue, comparer, propertyName);
-
-            if (propertyChanged && broadcast)
-            {
-                Broadcast(oldValue, newValue, propertyName);
-            }
-
-            return propertyChanged;
-        }
-
-        /// <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="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.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 SetProperty<T>(T oldValue, T newValue, Action<T> callback, bool broadcast, [CallerMemberName] string? propertyName = null)
-        {
-            bool propertyChanged = SetProperty(oldValue, newValue, callback, propertyName);
-
-            if (propertyChanged && broadcast)
-            {
-                Broadcast(oldValue, newValue, propertyName);
-            }
-
-            return propertyChanged;
-        }
-
-        /// <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="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)
-        {
-            bool propertyChanged = SetProperty(oldValue, newValue, comparer, callback, propertyName);
-
-            if (propertyChanged && broadcast)
-            {
-                Broadcast(oldValue, newValue, propertyName);
-            }
-
-            return propertyChanged;
-        }
-
-        /// <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="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)
-            where TModel : class
-        {
-            bool propertyChanged = SetProperty(oldValue, newValue, model, callback, propertyName);
-
-            if (propertyChanged && broadcast)
-            {
-                Broadcast(oldValue, newValue, propertyName);
-            }
-
-            return propertyChanged;
-        }
-
-        /// <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="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, 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);
-
-            if (propertyChanged && broadcast)
-            {
-                Broadcast(oldValue, newValue, propertyName);
-            }
-
-            return propertyChanged;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
deleted file mode 100644
index 9ed3481817b..00000000000
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/ObservableValidator.cs
+++ /dev/null
@@ -1,772 +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;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Contracts;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-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="ConditionalWeakTable{TKey,TValue}"/> instance used to track compiled delegates to validate entities.
-        /// </summary>
-        private static readonly ConditionalWeakTable<Type, Action<object>> EntityValidatorMap = new();
-
-        /// <summary>
-        /// The <see cref="ConditionalWeakTable{TKey, TValue}"/> instance used to track display names for properties to validate.
-        /// </summary>
-        /// <remarks>
-        /// This is necessary because we want to reuse the same <see cref="ValidationContext"/> instance for all validations, but
-        /// with the same behavior with repsect to formatted names that new instances would have provided. The issue is that the
-        /// <see cref="ValidationContext.DisplayName"/> property is not refreshed when we set <see cref="ValidationContext.MemberName"/>,
-        /// so we need to replicate the same logic to retrieve the right display name for properties to validate and update that
-        /// property manually right before passing the context to <see cref="Validator"/> and proceed with the normal functionality.
-        /// </remarks>
-        private static readonly ConditionalWeakTable<Type, Dictionary<string, string>> DisplayNamesMap = new();
-
-        /// <summary>
-        /// The cached <see cref="PropertyChangedEventArgs"/> for <see cref="HasErrors"/>.
-        /// </summary>
-        private static readonly PropertyChangedEventArgs HasErrorsChangedEventArgs = new(nameof(HasErrors));
-
-        /// <summary>
-        /// The <see cref="ValidationContext"/> instance currenty in use.
-        /// </summary>
-        private readonly ValidationContext validationContext;
-
-        /// <summary>
-        /// The <see cref="Dictionary{TKey,TValue}"/> instance used to store previous validation results.
-        /// </summary>
-        private readonly Dictionary<string, List<ValidationResult>> errors = new();
-
-        /// <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;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableValidator"/> class.
-        /// This constructor will create a new <see cref="ValidationContext"/> that will
-        /// be used to validate all properties, which will reference the current instance
-        /// and no additional services or validation properties and settings.
-        /// </summary>
-        protected ObservableValidator()
-        {
-            this.validationContext = new ValidationContext(this);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableValidator"/> class.
-        /// This constructor will create a new <see cref="ValidationContext"/> that will
-        /// be used to validate all properties, which will reference the current instance.
-        /// </summary>
-        /// <param name="items">A set of key/value pairs to make available to consumers.</param>
-        protected ObservableValidator(IDictionary<object, object?>? items)
-        {
-            this.validationContext = new ValidationContext(this, items);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableValidator"/> class.
-        /// This constructor will create a new <see cref="ValidationContext"/> that will
-        /// be used to validate all properties, which will reference the current instance.
-        /// </summary>
-        /// <param name="serviceProvider">An <see cref="IServiceProvider"/> instance to make available during validation.</param>
-        /// <param name="items">A set of key/value pairs to make available to consumers.</param>
-        protected ObservableValidator(IServiceProvider? serviceProvider, IDictionary<object, object?>? items)
-        {
-            this.validationContext = new ValidationContext(this, serviceProvider, items);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableValidator"/> class.
-        /// This constructor will store the input <see cref="ValidationContext"/> instance,
-        /// and it will use it to validate all properties for the current viewmodel.
-        /// </summary>
-        /// <param name="validationContext">
-        /// The <see cref="ValidationContext"/> instance to use to validate properties.
-        /// <para>
-        /// This instance will be passed to all <see cref="Validator.TryValidateObject(object, ValidationContext, ICollection{ValidationResult})"/>
-        /// calls executed by the current viewmodel, and its <see cref="ValidationContext.MemberName"/> property will be updated every time
-        /// before the call is made to set the name of the property being validated. The property name will not be reset after that, so the
-        /// value of <see cref="ValidationContext.MemberName"/> will always indicate the name of the last property that was validated, if any.
-        /// </para>
-        /// </param>
-        protected ObservableValidator(ValidationContext validationContext)
-        {
-            this.validationContext = validationContext;
-        }
-
-        /// <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>([NotNullIfNotNull("newValue")] ref T field, T newValue, bool validate, [CallerMemberName] string? propertyName = null)
-        {
-            bool propertyChanged = SetProperty(ref field, newValue, propertyName);
-
-            if (propertyChanged && validate)
-            {
-                ValidateProperty(newValue, propertyName);
-            }
-
-            return propertyChanged;
-        }
-
-        /// <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>([NotNullIfNotNull("newValue")] ref T field, T newValue, IEqualityComparer<T> comparer, bool validate, [CallerMemberName] string? propertyName = null)
-        {
-            bool propertyChanged = SetProperty(ref field, newValue, comparer, propertyName);
-
-            if (propertyChanged && validate)
-            {
-                ValidateProperty(newValue, propertyName);
-            }
-
-            return propertyChanged;
-        }
-
-        /// <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)
-        {
-            bool propertyChanged = SetProperty(oldValue, newValue, callback, propertyName);
-
-            if (propertyChanged && validate)
-            {
-                ValidateProperty(newValue, propertyName);
-            }
-
-            return propertyChanged;
-        }
-
-        /// <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)
-        {
-            bool propertyChanged = SetProperty(oldValue, newValue, comparer, callback, propertyName);
-
-            if (propertyChanged && validate)
-            {
-                ValidateProperty(newValue, propertyName);
-            }
-
-            return propertyChanged;
-        }
-
-        /// <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)
-            where TModel : class
-        {
-            bool propertyChanged = SetProperty(oldValue, newValue, model, callback, propertyName);
-
-            if (propertyChanged && validate)
-            {
-                ValidateProperty(newValue, propertyName);
-            }
-
-            return propertyChanged;
-        }
-
-        /// <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)
-            where TModel : class
-        {
-            bool propertyChanged = SetProperty(oldValue, newValue, comparer, model, callback, propertyName);
-
-            if (propertyChanged && validate)
-            {
-                ValidateProperty(newValue, propertyName);
-            }
-
-            return propertyChanged;
-        }
-
-        /// <summary>
-        /// Tries to validate a new value for a specified property. If the validation is successful,
-        /// <see cref="ObservableObject.SetProperty{T}(ref T,T,string?)"/> is called, otherwise no state change is performed.
-        /// </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="errors">The resulting validation errors, if any.</param>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        /// <returns>Whether the validation was successful and the property value changed as well.</returns>
-        protected bool TrySetProperty<T>(ref T field, T newValue, out IReadOnlyCollection<ValidationResult> errors, [CallerMemberName] string? propertyName = null)
-        {
-            return TryValidateProperty(newValue, propertyName, out errors) &&
-                   SetProperty(ref field, newValue, propertyName);
-        }
-
-        /// <summary>
-        /// Tries to validate a new value for a specified property. If the validation is successful,
-        /// <see cref="ObservableObject.SetProperty{T}(ref T,T,IEqualityComparer{T},string?)"/> is called, otherwise no state change is performed.
-        /// </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="errors">The resulting validation errors, if any.</param>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        /// <returns>Whether the validation was successful and the property value changed as well.</returns>
-        protected bool TrySetProperty<T>(ref T field, T newValue, IEqualityComparer<T> comparer, out IReadOnlyCollection<ValidationResult> errors, [CallerMemberName] string? propertyName = null)
-        {
-            return TryValidateProperty(newValue, propertyName, out errors) &&
-                   SetProperty(ref field, newValue, comparer, propertyName);
-        }
-
-        /// <summary>
-        /// Tries to validate a new value for a specified property. If the validation is successful,
-        /// <see cref="ObservableObject.SetProperty{T}(T,T,Action{T},string?)"/> is called, otherwise no state change is performed.
-        /// </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="errors">The resulting validation errors, if any.</param>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        /// <returns>Whether the validation was successful and the property value changed as well.</returns>
-        protected bool TrySetProperty<T>(T oldValue, T newValue, Action<T> callback, out IReadOnlyCollection<ValidationResult> errors, [CallerMemberName] string? propertyName = null)
-        {
-            return TryValidateProperty(newValue, propertyName, out errors) &&
-                   SetProperty(oldValue, newValue, callback, propertyName);
-        }
-
-        /// <summary>
-        /// Tries to validate a new value for a specified property. If the validation is successful,
-        /// <see cref="ObservableObject.SetProperty{T}(T,T,IEqualityComparer{T},Action{T},string?)"/> is called, otherwise no state change is performed.
-        /// </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="errors">The resulting validation errors, if any.</param>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        /// <returns>Whether the validation was successful and the property value changed as well.</returns>
-        protected bool TrySetProperty<T>(T oldValue, T newValue, IEqualityComparer<T> comparer, Action<T> callback, out IReadOnlyCollection<ValidationResult> errors, [CallerMemberName] string? propertyName = null)
-        {
-            return TryValidateProperty(newValue, propertyName, out errors) &&
-                   SetProperty(oldValue, newValue, comparer, callback, propertyName);
-        }
-
-        /// <summary>
-        /// Tries to validate a new value for a specified property. If the validation is successful,
-        /// <see cref="ObservableObject.SetProperty{TModel,T}(T,T,TModel,Action{TModel,T},string?)"/> is called, otherwise no state change is performed.
-        /// </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="errors">The resulting validation errors, if any.</param>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        /// <returns>Whether the validation was successful and the property value changed as well.</returns>
-        protected bool TrySetProperty<TModel, T>(T oldValue, T newValue, TModel model, Action<TModel, T> callback, out IReadOnlyCollection<ValidationResult> errors, [CallerMemberName] string? propertyName = null)
-            where TModel : class
-        {
-            return TryValidateProperty(newValue, propertyName, out errors) &&
-                   SetProperty(oldValue, newValue, model, callback, propertyName);
-        }
-
-        /// <summary>
-        /// Tries to validate a new value for a specified property. If the validation is successful,
-        /// <see cref="ObservableObject.SetProperty{TModel,T}(T,T,IEqualityComparer{T},TModel,Action{TModel,T},string?)"/> is called, otherwise no state change is performed.
-        /// </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="errors">The resulting validation errors, if any.</param>
-        /// <param name="propertyName">(optional) The name of the property that changed.</param>
-        /// <returns>Whether the validation was successful and the property value changed as well.</returns>
-        protected bool TrySetProperty<TModel, T>(T oldValue, T newValue, IEqualityComparer<T> comparer, TModel model, Action<TModel, T> callback, out IReadOnlyCollection<ValidationResult> errors, [CallerMemberName] string? propertyName = null)
-            where TModel : class
-        {
-            return TryValidateProperty(newValue, propertyName, out errors) &&
-                   SetProperty(oldValue, newValue, comparer, model, callback, propertyName);
-        }
-
-        /// <summary>
-        /// Clears the validation errors for a specified property or for the entire entity.
-        /// </summary>
-        /// <param name="propertyName">
-        /// The name of the property to clear validation errors for.
-        /// If a <see langword="null"/> or empty name is used, all entity-level errors will be cleared.
-        /// </param>
-        protected void ClearErrors(string? propertyName = null)
-        {
-            // Clear entity-level errors when the target property is null or empty
-            if (string.IsNullOrEmpty(propertyName))
-            {
-                ClearAllErrors();
-            }
-            else
-            {
-                ClearErrorsForProperty(propertyName!);
-            }
-        }
-
-        /// <inheritdoc cref="INotifyDataErrorInfo.GetErrors(string)"/>
-        [Pure]
-        public IEnumerable<ValidationResult> GetErrors(string? propertyName = null)
-        {
-            // Get entity-level errors when the target property is null or empty
-            if (string.IsNullOrEmpty(propertyName))
-            {
-                // Local function to gather all the entity-level errors
-                [Pure]
-                [MethodImpl(MethodImplOptions.NoInlining)]
-                IEnumerable<ValidationResult> GetAllErrors()
-                {
-                    return this.errors.Values.SelectMany(static errors => errors);
-                }
-
-                return GetAllErrors();
-            }
-
-            // Property-level errors, if any
-            if (this.errors.TryGetValue(propertyName!, out List<ValidationResult>? errors))
-            {
-                return errors;
-            }
-
-            // 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. This also matches the behavior of
-            // this method whenever errors for a valid properties are retrieved.
-            return Array.Empty<ValidationResult>();
-        }
-
-        /// <inheritdoc/>
-        [Pure]
-        IEnumerable INotifyDataErrorInfo.GetErrors(string? propertyName) => GetErrors(propertyName);
-
-        /// <summary>
-        /// Validates all the properties in the current instance and updates all the tracked errors.
-        /// If any changes are detected, the <see cref="ErrorsChanged"/> event will be raised.
-        /// </summary>
-        /// <remarks>
-        /// Only public instance properties (excluding custom indexers) that have at least one
-        /// <see cref="ValidationAttribute"/> applied to them will be validated. All other
-        /// members in the current instance will be ignored. None of the processed properties
-        /// will be modified - they will only be used to retrieve their values and validate them.
-        /// </remarks>
-        protected void ValidateAllProperties()
-        {
-            // Fast path that tries to create a delegate from a generated type-specific method. This
-            // is used to make this method more AOT-friendly and faster, as there is no dynamic code.
-            static Action<object> GetValidationAction(Type type)
-            {
-                if (type.Assembly.GetType("Microsoft.Toolkit.Mvvm.ComponentModel.__Internals.__ObservableValidatorExtensions") is Type extensionsType &&
-                    extensionsType.GetMethod("CreateAllPropertiesValidator", new[] { type }) is MethodInfo methodInfo)
-                {
-                    return (Action<object>)methodInfo.Invoke(null, new object?[] { null })!;
-                }
-
-                return GetValidationActionFallback(type);
-            }
-
-            // Fallback method to create the delegate with a compiled LINQ expression
-            static Action<object> GetValidationActionFallback(Type type)
-            {
-                // Get the collection of all properties to validate
-                (string Name, MethodInfo GetMethod)[] validatableProperties = (
-                    from property in type.GetProperties(BindingFlags.Instance | BindingFlags.Public)
-                    where property.GetIndexParameters().Length == 0 &&
-                          property.GetCustomAttributes<ValidationAttribute>(true).Any()
-                    let getMethod = property.GetMethod
-                    where getMethod is not null
-                    select (property.Name, getMethod)).ToArray();
-
-                // Short path if there are no properties to validate
-                if (validatableProperties.Length == 0)
-                {
-                    return static _ => { };
-                }
-
-                // MyViewModel inst0 = (MyViewModel)arg0;
-                ParameterExpression arg0 = Expression.Parameter(typeof(object));
-                UnaryExpression inst0 = Expression.Convert(arg0, type);
-
-                // Get a reference to ValidateProperty(object, string)
-                MethodInfo validateMethod = typeof(ObservableValidator).GetMethod(nameof(ValidateProperty), BindingFlags.Instance | BindingFlags.NonPublic)!;
-
-                // We want a single compiled LINQ expression that validates all properties in the
-                // actual type of the executing viewmodel at once. We do this by creating a block
-                // expression with the unrolled invocations of all properties to validate.
-                // Essentially, the body will contain the following code:
-                // ===============================================================================
-                // {
-                //     inst0.ValidateProperty(inst0.Property0, nameof(MyViewModel.Property0));
-                //     inst0.ValidateProperty(inst0.Property1, nameof(MyViewModel.Property1));
-                //     ...
-                //     inst0.ValidateProperty(inst0.PropertyN, nameof(MyViewModel.PropertyN));
-                // }
-                // ===============================================================================
-                // We also add an explicit object conversion to represent boxing, if a given property
-                // is a value type. It will just be a no-op if the value is a reference type already.
-                // Note that this generated code is technically accessing a protected method from
-                // ObservableValidator externally, but that is fine because IL doesn't really have
-                // a concept of member visibility, that's purely a C# build-time feature.
-                BlockExpression body = Expression.Block(
-                    from property in validatableProperties
-                    select Expression.Call(inst0, validateMethod, new Expression[]
-                    {
-                        Expression.Convert(Expression.Call(inst0, property.GetMethod), typeof(object)),
-                        Expression.Constant(property.Name)
-                    }));
-
-                return Expression.Lambda<Action<object>>(body, arg0).Compile();
-            }
-
-            // Get or compute the cached list of properties to validate. Here we're using a static lambda to ensure the
-            // delegate is cached by the C# compiler, see the related issue at https://github.com/dotnet/roslyn/issues/5835.
-            EntityValidatorMap.GetValue(GetType(), static t => GetValidationAction(t))(this);
-        }
-
-        /// <summary>
-        /// Validates a property with a specified name and a given input value.
-        /// If any changes are detected, the <see cref="ErrorsChanged"/> event will be raised.
-        /// </summary>
-        /// <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>
-        protected internal void ValidateProperty(object? value, [CallerMemberName] string? propertyName = null)
-        {
-            if (propertyName is null)
-            {
-                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();
-
-                this.errors.Add(propertyName!, propertyErrors);
-            }
-
-            bool errorsChanged = false;
-
-            // Clear the errors for the specified property, if any
-            if (propertyErrors.Count > 0)
-            {
-                propertyErrors.Clear();
-
-                errorsChanged = true;
-            }
-
-            // Validate the property, by adding new errors to the existing list
-            this.validationContext.MemberName = propertyName;
-            this.validationContext.DisplayName = GetDisplayNameForProperty(propertyName!);
-
-            bool isValid = Validator.TryValidateProperty(value, this.validationContext, propertyErrors);
-
-            // Update the shared counter for the number of errors, and raise the
-            // property changed event if necessary. We decrement the number of total
-            // errors if the current property is valid but it wasn't so before this
-            // validation, and we increment it if the validation failed after being
-            // correct before. The property changed event is raised whenever the
-            // number of total errors is either decremented to 0, or incremented to 1.
-            if (isValid)
-            {
-                if (errorsChanged)
-                {
-                    this.totalErrors--;
-
-                    if (this.totalErrors == 0)
-                    {
-                        OnPropertyChanged(HasErrorsChangedEventArgs);
-                    }
-                }
-            }
-            else if (!errorsChanged)
-            {
-                this.totalErrors++;
-
-                if (this.totalErrors == 1)
-                {
-                    OnPropertyChanged(HasErrorsChangedEventArgs);
-                }
-            }
-
-            // 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 || !isValid)
-            {
-                ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
-            }
-        }
-
-        /// <summary>
-        /// Tries to validate a property with a specified name and a given input value, and returns
-        /// the computed errors, if any. If the property is valid, it is assumed that its value is
-        /// about to be set in the current object. Otherwise, no observable local state is modified.
-        /// </summary>
-        /// <param name="value">The value to test for the specified property.</param>
-        /// <param name="propertyName">The name of the property to validate.</param>
-        /// <param name="errors">The resulting validation errors, if any.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="propertyName"/> is <see langword="null"/>.</exception>
-        private bool TryValidateProperty(object? value, string? propertyName, out IReadOnlyCollection<ValidationResult> errors)
-        {
-            if (propertyName is null)
-            {
-                ThrowArgumentNullExceptionForNullPropertyName();
-            }
-
-            // Add the cached errors list for later use.
-            if (!this.errors.TryGetValue(propertyName!, out List<ValidationResult>? propertyErrors))
-            {
-                propertyErrors = new();
-
-                this.errors.Add(propertyName!, propertyErrors);
-            }
-
-            bool hasErrors = propertyErrors.Count > 0;
-
-            List<ValidationResult> localErrors = new();
-
-            // Validate the property, by adding new errors to the local list
-            this.validationContext.MemberName = propertyName;
-            this.validationContext.DisplayName = GetDisplayNameForProperty(propertyName!);
-
-            bool isValid = Validator.TryValidateProperty(value, this.validationContext, localErrors);
-
-            // We only modify the state if the property is valid and it wasn't so before. In this case, we
-            // clear the cached list of errors (which is visible to consumers) and raise the necessary events.
-            if (isValid && hasErrors)
-            {
-                propertyErrors.Clear();
-
-                this.totalErrors--;
-
-                if (this.totalErrors == 0)
-                {
-                    OnPropertyChanged(HasErrorsChangedEventArgs);
-                }
-
-                ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
-            }
-
-            errors = localErrors;
-
-            return isValid;
-        }
-
-        /// <summary>
-        /// Clears all the current errors for the entire entity.
-        /// </summary>
-        private void ClearAllErrors()
-        {
-            if (this.totalErrors == 0)
-            {
-                return;
-            }
-
-            // Clear the errors for all properties with at least one error, and raise the
-            // ErrorsChanged event for those properties. Other properties will be ignored.
-            foreach (var propertyInfo in this.errors)
-            {
-                bool hasErrors = propertyInfo.Value.Count > 0;
-
-                propertyInfo.Value.Clear();
-
-                if (hasErrors)
-                {
-                    ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyInfo.Key));
-                }
-            }
-
-            this.totalErrors = 0;
-
-            OnPropertyChanged(HasErrorsChangedEventArgs);
-        }
-
-        /// <summary>
-        /// Clears all the current errors for a target property.
-        /// </summary>
-        /// <param name="propertyName">The name of the property to clear errors for.</param>
-        private void ClearErrorsForProperty(string propertyName)
-        {
-            if (!this.errors.TryGetValue(propertyName!, out List<ValidationResult>? propertyErrors) ||
-                propertyErrors.Count == 0)
-            {
-                return;
-            }
-
-            propertyErrors.Clear();
-
-            this.totalErrors--;
-
-            if (this.totalErrors == 0)
-            {
-                OnPropertyChanged(HasErrorsChangedEventArgs);
-            }
-
-            ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
-        }
-
-        /// <summary>
-        /// Gets the display name for a given property. It could be a custom name or just the property name.
-        /// </summary>
-        /// <param name="propertyName">The target property name being validated.</param>
-        /// <returns>The display name for the property.</returns>
-        private string GetDisplayNameForProperty(string propertyName)
-        {
-            static Dictionary<string, string> GetDisplayNames(Type type)
-            {
-                Dictionary<string, string> displayNames = new();
-
-                foreach (PropertyInfo property in type.GetProperties(BindingFlags.Instance | BindingFlags.Public))
-                {
-                    if (property.GetCustomAttribute<DisplayAttribute>() is DisplayAttribute attribute &&
-                        attribute.GetName() is string displayName)
-                    {
-                        displayNames.Add(property.Name, displayName);
-                    }
-                }
-
-                return displayNames;
-            }
-
-            // This method replicates the logic of DisplayName and GetDisplayName from the
-            // ValidationContext class. See the original source in the BCL for more details.
-            _ = DisplayNamesMap.GetValue(GetType(), static t => GetDisplayNames(t)).TryGetValue(propertyName, out string? displayName);
-
-            return displayName ?? 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
diff --git a/Microsoft.Toolkit.Mvvm/ComponentModel/__Internals/__ObservableValidatorHelper.cs b/Microsoft.Toolkit.Mvvm/ComponentModel/__Internals/__ObservableValidatorHelper.cs
deleted file mode 100644
index bd9ee7ede80..00000000000
--- a/Microsoft.Toolkit.Mvvm/ComponentModel/__Internals/__ObservableValidatorHelper.cs
+++ /dev/null
@@ -1,33 +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.
-
-#pragma warning disable SA1300
-
-using System;
-using System.ComponentModel;
-
-namespace Microsoft.Toolkit.Mvvm.ComponentModel.__Internals
-{
-    /// <summary>
-    /// An internal helper to support the source generator APIs related to <see cref="ObservableValidator"/>.
-    /// This type is not intended to be used directly by user code.
-    /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    [Obsolete("This type is not intended to be used directly by user code")]
-    public static class __ObservableValidatorHelper
-    {
-        /// <summary>
-        /// Invokes <see cref="ObservableValidator.ValidateProperty(object?, string?)"/> externally on a target instance.
-        /// </summary>
-        /// <param name="instance">The target <see cref="ObservableValidator"/> instance.</param>
-        /// <param name="value">The value to test for the specified property.</param>
-        /// <param name="propertyName">The name of the property to validate.</param>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("This method is not intended to be called directly by user code")]
-        public static void ValidateProperty(ObservableValidator instance, object? value, string propertyName)
-        {
-            instance.ValidateProperty(value, propertyName);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs b/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
deleted file mode 100644
index 1a259221e18..00000000000
--- a/Microsoft.Toolkit.Mvvm/DependencyInjection/Ioc.cs
+++ /dev/null
@@ -1,167 +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;
-
-#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 the <see cref="ConfigureServices"/>
-    /// method and passing an <see cref="IServiceProvider"/> instance with the services to use. That instance can
-    /// be from any library offering dependency injection functionality, such as Microsoft.Extensions.DependencyInjection.
-    /// For instance, using that library, <see cref="ConfigureServices"/> can be used as follows in this example:
-    /// <code>
-    /// Ioc.Default.ConfigureServices(
-    ///     new ServiceCollection()
-    ///     .AddSingleton&lt;ILogger, Logger&gt;()
-    ///     .BuildServiceProvider());
-    /// </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();
-
-        /// <summary>
-        /// The <see cref="IServiceProvider"/> instance to use, if initialized.
-        /// </summary>
-        private volatile IServiceProvider? serviceProvider;
-
-        /// <inheritdoc/>
-        public object? 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.
-            IServiceProvider? provider = this.serviceProvider;
-
-            if (provider is null)
-            {
-                ThrowInvalidOperationExceptionForMissingInitialization();
-            }
-
-            return provider!.GetService(serviceType);
-        }
-
-        /// <summary>
-        /// Tries to resolve an instance of a specified service type.
-        /// </summary>
-        /// <typeparam name="T">The type of service to resolve.</typeparam>
-        /// <returns>An instance of the specified service, or <see langword="null"/>.</returns>
-        /// <exception cref="InvalidOperationException">Throw if the current <see cref="Ioc"/> instance has not been initialized.</exception>
-        public T? GetService<T>()
-            where T : class
-        {
-            IServiceProvider? provider = this.serviceProvider;
-
-            if (provider is null)
-            {
-                ThrowInvalidOperationExceptionForMissingInitialization();
-            }
-
-            return (T?)provider!.GetService(typeof(T));
-        }
-
-        /// <summary>
-        /// Resolves an instance of a specified service type.
-        /// </summary>
-        /// <typeparam name="T">The type of service to resolve.</typeparam>
-        /// <returns>An instance of the specified service, or <see langword="null"/>.</returns>
-        /// <exception cref="InvalidOperationException">
-        /// Throw if the current <see cref="Ioc"/> instance has not been initialized, or if the
-        /// requested service type was not registered in the service provider currently in use.
-        /// </exception>
-        public T GetRequiredService<T>()
-            where T : class
-        {
-            IServiceProvider? provider = this.serviceProvider;
-
-            if (provider is null)
-            {
-                ThrowInvalidOperationExceptionForMissingInitialization();
-            }
-
-            T? service = (T?)provider!.GetService(typeof(T));
-
-            if (service is null)
-            {
-                ThrowInvalidOperationExceptionForUnregisteredType();
-            }
-
-            return service!;
-        }
-
-        /// <summary>
-        /// Initializes the shared <see cref="IServiceProvider"/> instance.
-        /// </summary>
-        /// <param name="serviceProvider">The input <see cref="IServiceProvider"/> instance to use.</param>
-        public void ConfigureServices(IServiceProvider serviceProvider)
-        {
-            IServiceProvider? oldServices = Interlocked.CompareExchange(ref this.serviceProvider, serviceProvider, null);
-
-            if (oldServices is not null)
-            {
-                ThrowInvalidOperationExceptionForRepeatedConfiguration();
-            }
-        }
-
-        /// <summary>
-        /// Throws an <see cref="InvalidOperationException"/> when the <see cref="IServiceProvider"/> 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 the <see cref="IServiceProvider"/> property is missing a type registration.
-        /// </summary>
-        private static void ThrowInvalidOperationExceptionForUnregisteredType()
-        {
-            throw new InvalidOperationException("The requested service type was not registered");
-        }
-
-        /// <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");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
deleted file mode 100644
index 71a123cfa27..00000000000
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand.cs
+++ /dev/null
@@ -1,186 +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.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-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"/> 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, IAsyncRelayCommand
-    {
-        /// <summary>
-        /// The cached <see cref="PropertyChangedEventArgs"/> for <see cref="CanBeCanceled"/>.
-        /// </summary>
-        internal static readonly PropertyChangedEventArgs CanBeCanceledChangedEventArgs = new(nameof(CanBeCanceled));
-
-        /// <summary>
-        /// The cached <see cref="PropertyChangedEventArgs"/> for <see cref="IsCancellationRequested"/>.
-        /// </summary>
-        internal static readonly PropertyChangedEventArgs IsCancellationRequestedChangedEventArgs = new(nameof(IsCancellationRequested));
-
-        /// <summary>
-        /// The cached <see cref="PropertyChangedEventArgs"/> for <see cref="IsRunning"/>.
-        /// </summary>
-        internal static readonly PropertyChangedEventArgs IsRunningChangedEventArgs = new(nameof(IsRunning));
-
-        /// <summary>
-        /// The <see cref="Func{TResult}"/> to invoke when <see cref="Execute"/> is used.
-        /// </summary>
-        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>? cancelableExecute;
-
-        /// <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="cancelableExecute"/>.
-        /// </summary>
-        /// <remarks>This is only used when <see cref="cancelableExecute"/> is not <see langword="null"/>.</remarks>
-        private CancellationTokenSource? cancellationTokenSource;
-
-        /// <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="cancelableExecute">The cancelable execution logic.</param>
-        public AsyncRelayCommand(Func<CancellationToken, Task> cancelableExecute)
-        {
-            this.cancelableExecute = cancelableExecute;
-        }
-
-        /// <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)
-        {
-            this.execute = execute;
-            this.canExecute = canExecute;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AsyncRelayCommand"/> class.
-        /// </summary>
-        /// <param name="cancelableExecute">The cancelable execution logic.</param>
-        /// <param name="canExecute">The execution status logic.</param>
-        public AsyncRelayCommand(Func<CancellationToken, Task> cancelableExecute, Func<bool> canExecute)
-        {
-            this.cancelableExecute = cancelableExecute;
-            this.canExecute = canExecute;
-        }
-
-        private TaskNotifier? executionTask;
-
-        /// <inheritdoc/>
-        public Task? ExecutionTask
-        {
-            get => this.executionTask;
-            private set
-            {
-                if (SetPropertyAndNotifyOnCompletion(ref this.executionTask, value, _ =>
-                {
-                    // When the task completes
-                    OnPropertyChanged(IsRunningChangedEventArgs);
-                    OnPropertyChanged(CanBeCanceledChangedEventArgs);
-                }))
-                {
-                    // When setting the task
-                    OnPropertyChanged(IsRunningChangedEventArgs);
-                    OnPropertyChanged(CanBeCanceledChangedEventArgs);
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool CanBeCanceled => this.cancelableExecute is not null && IsRunning;
-
-        /// <inheritdoc/>
-        public bool IsCancellationRequested => this.cancellationTokenSource?.IsCancellationRequested == true;
-
-        /// <inheritdoc/>
-        public bool IsRunning => ExecutionTask?.IsCompleted == false;
-
-        /// <inheritdoc/>
-        public void NotifyCanExecuteChanged()
-        {
-            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)
-        {
-            _ = ExecuteAsync(parameter);
-        }
-
-        /// <inheritdoc/>
-        public Task ExecuteAsync(object? parameter)
-        {
-            if (CanExecute(parameter))
-            {
-                // Non cancelable command delegate
-                if (this.execute is not null)
-                {
-                    return ExecutionTask = this.execute();
-                }
-
-                // Cancel the previous operation, if one is pending
-                this.cancellationTokenSource?.Cancel();
-
-                CancellationTokenSource cancellationTokenSource = this.cancellationTokenSource = new();
-
-                OnPropertyChanged(IsCancellationRequestedChangedEventArgs);
-
-                // Invoke the cancelable command delegate with a new linked token
-                return ExecutionTask = this.cancelableExecute!(cancellationTokenSource.Token);
-            }
-
-            return Task.CompletedTask;
-        }
-
-        /// <inheritdoc/>
-        public void Cancel()
-        {
-            this.cancellationTokenSource?.Cancel();
-
-            OnPropertyChanged(IsCancellationRequestedChangedEventArgs);
-            OnPropertyChanged(CanBeCanceledChangedEventArgs);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
deleted file mode 100644
index d24b4705d82..00000000000
--- a/Microsoft.Toolkit.Mvvm/Input/AsyncRelayCommand{T}.cs
+++ /dev/null
@@ -1,196 +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 System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-namespace Microsoft.Toolkit.Mvvm.Input
-{
-    /// <summary>
-    /// 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, IAsyncRelayCommand<T>
-    {
-        /// <summary>
-        /// The <see cref="Func{TResult}"/> to invoke when <see cref="Execute(T)"/> is used.
-        /// </summary>
-        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>? cancelableExecute;
-
-        /// <summary>
-        /// The optional action to invoke when <see cref="CanExecute(T)"/> is used.
-        /// </summary>
-        private readonly Predicate<T?>? canExecute;
-
-        /// <summary>
-        /// The <see cref="CancellationTokenSource"/> instance to use to cancel <see cref="cancelableExecute"/>.
-        /// </summary>
-        private CancellationTokenSource? cancellationTokenSource;
-
-        /// <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>
-        /// <remarks>See notes in <see cref="RelayCommand{T}(Action{T})"/>.</remarks>
-        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="cancelableExecute">The cancelable execution logic.</param>
-        /// <remarks>See notes in <see cref="RelayCommand{T}(Action{T})"/>.</remarks>
-        public AsyncRelayCommand(Func<T?, CancellationToken, Task> cancelableExecute)
-        {
-            this.cancelableExecute = cancelableExecute;
-        }
-
-        /// <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>
-        public AsyncRelayCommand(Func<T?, Task> execute, Predicate<T?> canExecute)
-        {
-            this.execute = execute;
-            this.canExecute = canExecute;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AsyncRelayCommand{T}"/> class.
-        /// </summary>
-        /// <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> cancelableExecute, Predicate<T?> canExecute)
-        {
-            this.cancelableExecute = cancelableExecute;
-            this.canExecute = canExecute;
-        }
-
-        private TaskNotifier? executionTask;
-
-        /// <inheritdoc/>
-        public Task? ExecutionTask
-        {
-            get => this.executionTask;
-            private set
-            {
-                if (SetPropertyAndNotifyOnCompletion(ref this.executionTask, value, _ =>
-                {
-                    // When the task completes
-                    OnPropertyChanged(AsyncRelayCommand.IsRunningChangedEventArgs);
-                    OnPropertyChanged(AsyncRelayCommand.CanBeCanceledChangedEventArgs);
-                }))
-                {
-                    // When setting the task
-                    OnPropertyChanged(AsyncRelayCommand.IsRunningChangedEventArgs);
-                    OnPropertyChanged(AsyncRelayCommand.CanBeCanceledChangedEventArgs);
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool CanBeCanceled => this.cancelableExecute is not null && IsRunning;
-
-        /// <inheritdoc/>
-        public bool IsCancellationRequested => this.cancellationTokenSource?.IsCancellationRequested == true;
-
-        /// <inheritdoc/>
-        public bool IsRunning => ExecutionTask?.IsCompleted == false;
-
-        /// <inheritdoc/>
-        public void NotifyCanExecuteChanged()
-        {
-            CanExecuteChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool CanExecute(T? parameter)
-        {
-            return this.canExecute?.Invoke(parameter) != false;
-        }
-
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool CanExecute(object? parameter)
-        {
-            if (default(T) is not null &&
-                parameter is null)
-            {
-                return false;
-            }
-
-            return CanExecute((T?)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))
-            {
-                // Non cancelable command delegate
-                if (this.execute is not null)
-                {
-                    return ExecutionTask = this.execute(parameter);
-                }
-
-                // Cancel the previous operation, if one is pending
-                this.cancellationTokenSource?.Cancel();
-
-                CancellationTokenSource cancellationTokenSource = this.cancellationTokenSource = new();
-
-                OnPropertyChanged(AsyncRelayCommand.IsCancellationRequestedChangedEventArgs);
-
-                // Invoke the cancelable command delegate with a new linked token
-                return ExecutionTask = this.cancelableExecute!(parameter, cancellationTokenSource.Token);
-            }
-
-            return Task.CompletedTask;
-        }
-
-        /// <inheritdoc/>
-        public Task ExecuteAsync(object? parameter)
-        {
-            return ExecuteAsync((T?)parameter);
-        }
-
-        /// <inheritdoc/>
-        public void Cancel()
-        {
-            this.cancellationTokenSource?.Cancel();
-
-            OnPropertyChanged(AsyncRelayCommand.IsCancellationRequestedChangedEventArgs);
-            OnPropertyChanged(AsyncRelayCommand.CanBeCanceledChangedEventArgs);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/Attributes/ICommandAttribute.cs b/Microsoft.Toolkit.Mvvm/Input/Attributes/ICommandAttribute.cs
deleted file mode 100644
index 2a701d86b72..00000000000
--- a/Microsoft.Toolkit.Mvvm/Input/Attributes/ICommandAttribute.cs
+++ /dev/null
@@ -1,66 +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.Windows.Input;
-
-namespace Microsoft.Toolkit.Mvvm.Input
-{
-    /// <summary>
-    /// An attribute that can be used to automatically generate <see cref="ICommand"/> properties from declared methods. When this attribute
-    /// is used to decorate a method, a generator will create a command property with the corresponding <see cref="IRelayCommand"/> interface
-    /// depending on the signature of the method. If an invalid method signature is used, the generator will report an error.
-    /// <para>
-    /// In order to use this attribute, the containing type doesn't need to implement any interfaces. The generated properties will be lazily
-    /// assigned but their value will never change, so there is no need to support property change notifications or other additional functionality.
-    /// </para>
-    /// <para>
-    /// This attribute can be used as follows:
-    /// <code>
-    /// partial class MyViewModel
-    /// {
-    ///     [ICommand]
-    ///     private void GreetUser(User? user)
-    ///     {
-    ///         Console.WriteLine($"Hello {user.Name}!");
-    ///     }
-    /// }
-    /// </code>
-    /// And with this, code analogous to this will be generated:
-    /// <code>
-    /// partial class MyViewModel
-    /// {
-    ///     private IRelayCommand? greetUserCommand;
-    ///
-    ///     public IRelayCommand GreetUserCommand => greetUserCommand ??= new RelayCommand(GreetUser);
-    /// }
-    /// </code>
-    /// </para>
-    /// <para>
-    /// The following signatures are supported for annotated methods:
-    /// <code>
-    /// void Method();
-    /// </code>
-    /// Will generate an <see cref="IRelayCommand"/> property (using a <see cref="RelayCommand"/> instance).
-    /// <code>
-    /// void Method(T?);
-    /// </code>
-    /// Will generate an <see cref="IRelayCommand{T}"/> property (using a <see cref="RelayCommand{T}"/> instance).
-    /// <code>
-    /// Task Method();
-    /// Task Method(CancellationToken);
-    /// </code>
-    /// Will both generate an <see cref="IAsyncRelayCommand"/> property (using an <see cref="AsyncRelayCommand{T}"/> instance).
-    /// <code>
-    /// Task Method(T?);
-    /// Task Method(T?, CancellationToken);
-    /// </code>
-    /// Will both generate an <see cref="IAsyncRelayCommand{T}"/> property (using an <see cref="AsyncRelayCommand{T}"/> instance).
-    /// </para>
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
-    public sealed class ICommandAttribute : Attribute
-    {
-    }
-}
diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
deleted file mode 100644
index 7af8823266e..00000000000
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand.cs
+++ /dev/null
@@ -1,53 +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.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>
-        /// Gets a value indicating whether running operations for this command can be canceled.
-        /// </summary>
-        bool CanBeCanceled { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether a cancelation request has been issued for the current operation.
-        /// </summary>
-        bool IsCancellationRequested { get; }
-
-        /// <summary>
-        /// Gets a value indicating 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.
-        /// </summary>
-        /// <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();
-    }
-}
\ 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
deleted file mode 100644
index 3cab9b2bb9f..00000000000
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IAsyncRelayCommand{T}.cs
+++ /dev/null
@@ -1,23 +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.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 diamond 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);
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand.cs
deleted file mode 100644
index 491db2211c5..00000000000
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand.cs
+++ /dev/null
@@ -1,20 +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.Windows.Input;
-
-namespace Microsoft.Toolkit.Mvvm.Input
-{
-    /// <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>
-        /// Notifies that the <see cref="ICommand.CanExecute"/> property has changed.
-        /// </summary>
-        void NotifyCanExecuteChanged();
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand{T}.cs
deleted file mode 100644
index 209e3953718..00000000000
--- a/Microsoft.Toolkit.Mvvm/Input/Interfaces/IRelayCommand{T}.cs
+++ /dev/null
@@ -1,30 +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.Windows.Input;
-
-namespace Microsoft.Toolkit.Mvvm.Input
-{
-    /// <summary>
-    /// 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 IRelayCommand<in T> : IRelayCommand
-    {
-        /// <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);
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
deleted file mode 100644
index a702f2327c1..00000000000
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand.cs
+++ /dev/null
@@ -1,78 +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.
-
-#pragma warning disable SA1512
-
-// This file is inspired from the MvvmLight library (lbugnion/MvvmLight),
-// more info in ThirdPartyNotices.txt in the root of the project.
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Mvvm.Input
-{
-    /// <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 : IRelayCommand
-    {
-        /// <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 = execute;
-        }
-
-        /// <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;
-        }
-
-        /// <inheritdoc/>
-        public void NotifyCanExecuteChanged()
-        {
-            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
diff --git a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs b/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
deleted file mode 100644
index f8bf29c263d..00000000000
--- a/Microsoft.Toolkit.Mvvm/Input/RelayCommand{T}.cs
+++ /dev/null
@@ -1,104 +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.
-
-#pragma warning disable SA1512
-
-// This file is inspired from the MvvmLight library (lbugnion/MvvmLight),
-// more info in ThirdPartyNotices.txt in the root of the project.
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Mvvm.Input
-{
-    /// <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> : IRelayCommand<T>
-    {
-        /// <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 Predicate<T?>? 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>
-        /// <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;
-        }
-
-        /// <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>
-        /// <remarks>See notes in <see cref="RelayCommand{T}(Action{T})"/>.</remarks>
-        public RelayCommand(Action<T?> execute, Predicate<T?> canExecute)
-        {
-            this.execute = execute;
-            this.canExecute = canExecute;
-        }
-
-        /// <inheritdoc/>
-        public void NotifyCanExecuteChanged()
-        {
-            CanExecuteChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        /// <inheritdoc/>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool CanExecute(T? parameter)
-        {
-            return this.canExecute?.Invoke(parameter) != false;
-        }
-
-        /// <inheritdoc/>
-        public bool CanExecute(object? parameter)
-        {
-            if (default(T) is not null &&
-                parameter is null)
-            {
-                return false;
-            }
-
-            return CanExecute((T?)parameter);
-        }
-
-        /// <inheritdoc/>
-        [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
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
deleted file mode 100644
index df1882c904d..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessenger.cs
+++ /dev/null
@@ -1,163 +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;
-
-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="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 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.
-    /// 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="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="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
-    {
-        /// <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 : IEquatable<TToken>;
-
-        /// <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{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<TRecipient, TMessage, TToken>(TRecipient recipient, TToken token, MessageHandler<TRecipient, TMessage> handler)
-            where TRecipient : class
-            where TMessage : class
-            where TToken : IEquatable<TToken>;
-
-        /// <summary>
-        /// 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 UnregisterAll(object recipient);
-
-        /// <summary>
-        /// 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>
-        /// <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 UnregisterAll<TToken>(object recipient, TToken token)
-            where TToken : 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 : 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>
-        /// <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>;
-
-        /// <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>
-        void Reset();
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs
deleted file mode 100644
index 2c8769f701a..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs
+++ /dev/null
@@ -1,364 +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.Linq;
-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 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="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>
-        private static class MethodInfos
-        {
-            /// <summary>
-            /// The <see cref="MethodInfo"/> instance associated with <see cref="Register{TMessage,TToken}(IMessenger,IRecipient{TMessage},TToken)"/>.
-            /// </summary>
-            public static readonly MethodInfo RegisterIRecipient = new Action<IMessenger, IRecipient<object>, Unit>(Register).Method.GetGenericMethodDefinition();
-        }
-
-        /// <summary>
-        /// A non-generic version of <see cref="DiscoveredRecipients{TToken}"/>.
-        /// </summary>
-        private static class DiscoveredRecipients
-        {
-            /// <summary>
-            /// The <see cref="ConditionalWeakTable{TKey,TValue}"/> instance used to track the preloaded registration action for each recipient.
-            /// </summary>
-            public static readonly ConditionalWeakTable<Type, Action<IMessenger, object>?> RegistrationMethods = new();
-        }
-
-        /// <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 action for each recipient.
-            /// </summary>
-            public static readonly ConditionalWeakTable<Type, Action<IMessenger, object, TToken>> RegistrationMethods = new();
-        }
-
-        /// <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 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="RegisterAll{TToken}(IMessenger,object,TToken)"/> for more info.</remarks>
-        public static void RegisterAll(this IMessenger messenger, object recipient)
-        {
-            // We use this method as a callback for the conditional weak table, which will handle
-            // thread-safety for us. This first callback will try to find a generated method for the
-            // target recipient type, and just invoke it to get the delegate to cache and use later.
-            static Action<IMessenger, object>? LoadRegistrationMethodsForType(Type recipientType)
-            {
-                if (recipientType.Assembly.GetType("Microsoft.Toolkit.Mvvm.Messaging.__Internals.__IMessengerExtensions") is Type extensionsType &&
-                    extensionsType.GetMethod("CreateAllMessagesRegistrator", new[] { recipientType }) is MethodInfo methodInfo)
-                {
-                    return (Action<IMessenger, object>)methodInfo.Invoke(null, new object?[] { null })!;
-                }
-
-                return null;
-            }
-
-            // Try to get the cached delegate, if the generatos has run correctly
-            Action<IMessenger, object>? registrationAction = DiscoveredRecipients.RegistrationMethods.GetValue(
-                recipient.GetType(),
-                static t => LoadRegistrationMethodsForType(t));
-
-            if (registrationAction is not null)
-            {
-                registrationAction(messenger, recipient);
-            }
-            else
-            {
-                messenger.RegisterAll(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="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
-        /// registered directly through any of the other generic extensions for the <see cref="IMessenger"/> interface.
-        /// </remarks>
-        public static void RegisterAll<TToken>(this IMessenger messenger, object recipient, TToken token)
-            where TToken : IEquatable<TToken>
-        {
-            // We use this method as a callback for the conditional weak table, which will handle
-            // thread-safety for us. This first callback will try to find a generated method for the
-            // target recipient type, and just invoke it to get the delegate to cache and use later.
-            // In this case we also need to create a generic instantiation of the target method first.
-            static Action<IMessenger, object, TToken> LoadRegistrationMethodsForType(Type recipientType)
-            {
-                if (recipientType.Assembly.GetType("Microsoft.Toolkit.Mvvm.Messaging.__Internals.__IMessengerExtensions") is Type extensionsType &&
-                    extensionsType.GetMethod("CreateAllMessagesRegistratorWithToken", new[] { recipientType }) is MethodInfo methodInfo)
-                {
-                    MethodInfo genericMethodInfo = methodInfo.MakeGenericMethod(typeof(TToken));
-
-                    return (Action<IMessenger, object, TToken>)genericMethodInfo.Invoke(null, new object?[] { null })!;
-                }
-
-                return LoadRegistrationMethodsForTypeFallback(recipientType);
-            }
-
-            // Fallback method when a generated method is not found.
-            // 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.
-            // The LINQ codegen bloat is not really important for the same reason.
-            static Action<IMessenger, object, TToken> LoadRegistrationMethodsForTypeFallback(Type recipientType)
-            {
-                // Get the collection of validation methods
-                MethodInfo[] registrationMethods = (
-                    from interfaceType in recipientType.GetInterfaces()
-                    where interfaceType.IsGenericType &&
-                          interfaceType.GetGenericTypeDefinition() == typeof(IRecipient<>)
-                    let messageType = interfaceType.GenericTypeArguments[0]
-                    select MethodInfos.RegisterIRecipient.MakeGenericMethod(messageType, typeof(TToken))).ToArray();
-
-                // Short path if there are no message handlers to register
-                if (registrationMethods.Length == 0)
-                {
-                    return static (_, _, _) => { };
-                }
-
-                // Input parameters (IMessenger instance, non-generic recipient, token)
-                ParameterExpression
-                    arg0 = Expression.Parameter(typeof(IMessenger)),
-                    arg1 = Expression.Parameter(typeof(object)),
-                    arg2 = Expression.Parameter(typeof(TToken));
-
-                // Declare a local resulting from the (RecipientType)recipient cast
-                UnaryExpression inst1 = Expression.Convert(arg1, recipientType);
-
-                // We want a single compiled LINQ expression that executes the registration for all
-                // the declared message types in the input type. To do so, we create a block with the
-                // unrolled invocations for the indivudual message registration (for each IRecipient<T>).
-                // The code below will generate the following block expression:
-                // ===============================================================================
-                // {
-                //     var inst1 = (RecipientType)arg1;
-                //     IMessengerExtensions.Register<T0, TToken>(arg0, inst1, arg2);
-                //     IMessengerExtensions.Register<T1, TToken>(arg0, inst1, arg2);
-                //     ...
-                //     IMessengerExtensions.Register<TN, TToken>(arg0, inst1, arg2);
-                // }
-                // ===============================================================================
-                // We also add an explicit object conversion to cast the input recipient type to
-                // the actual specific type, so that the exposed message handlers are accessible.
-                BlockExpression body = Expression.Block(
-                    from registrationMethod in registrationMethods
-                    select Expression.Call(registrationMethod, new Expression[]
-                    {
-                        arg0,
-                        inst1,
-                        arg2
-                    }));
-
-                return Expression.Lambda<Action<IMessenger, object, TToken>>(body, arg0, arg1, arg2).Compile();
-            }
-
-            // Get or compute the registration method for the current recipient type.
-            // As in Microsoft.Toolkit.Diagnostics.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.
-            Action<IMessenger, object, TToken> registrationAction = DiscoveredRecipients<TToken>.RegistrationMethods.GetValue(
-                recipient.GetType(),
-                static t => LoadRegistrationMethodsForType(t));
-
-            // Invoke the cached delegate to actually execute the message registration
-            registrationAction(messenger, recipient, token);
-        }
-
-        /// <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, IRecipient<TMessage> recipient)
-            where TMessage : class
-        {
-            messenger.Register<IRecipient<TMessage>, TMessage, Unit>(recipient, default, static (r, m) => r.Receive(m));
-        }
-
-        /// <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, IRecipient<TMessage> recipient, TToken token)
-            where TMessage : class
-            where TToken : IEquatable<TToken>
-        {
-            messenger.Register<IRecipient<TMessage>, TMessage, TToken>(recipient, token, static (r, m) => r.Receive(m));
-        }
-
-        /// <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="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<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>
-        /// <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>
-        /// <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 TMessage Send<TMessage>(this IMessenger messenger)
-            where TMessage : class, new()
-        {
-            return 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>
-        /// <returns>The message that was sent (ie. <paramref name="message"/>).</returns>
-        public static TMessage Send<TMessage>(this IMessenger messenger, TMessage message)
-            where TMessage : class
-        {
-            return 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>
-        /// <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 TMessage Send<TMessage, TToken>(this IMessenger messenger, TToken token)
-            where TMessage : class, new()
-            where TToken : IEquatable<TToken>
-        {
-            return messenger.Send(new TMessage(), token);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IRecipient{TMessage}.cs b/Microsoft.Toolkit.Mvvm/Messaging/IRecipient{TMessage}.cs
deleted file mode 100644
index e6a5909415c..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/IRecipient{TMessage}.cs
+++ /dev/null
@@ -1,20 +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.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 IRecipient<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);
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/ArrayPoolBufferWriter{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/ArrayPoolBufferWriter{T}.cs
deleted file mode 100644
index 4cff9ae3122..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/ArrayPoolBufferWriter{T}.cs
+++ /dev/null
@@ -1,107 +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.Buffers;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Mvvm.Messaging.Internals
-{
-    /// <summary>
-    /// A simple buffer writer implementation using pooled arrays.
-    /// </summary>
-    /// <typeparam name="T">The type of items to store in the list.</typeparam>
-    /// <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>
-    internal ref struct ArrayPoolBufferWriter<T>
-    {
-        /// <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>
-        /// Creates a new instance of the <see cref="ArrayPoolBufferWriter{T}"/> struct.
-        /// </summary>
-        /// <returns>A new <see cref="ArrayPoolBufferWriter{T}"/> instance.</returns>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ArrayPoolBufferWriter<T> Create()
-        {
-            return new() { array = ArrayPool<T>.Shared.Rent(DefaultInitialBufferSize) };
-        }
-
-        /// <summary>
-        /// Gets a <see cref="ReadOnlySpan{T}"/> with the current items.
-        /// </summary>
-        public ReadOnlySpan<T> Span
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => this.array.AsSpan(0, 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 cref="IDisposable.Dispose"/>
-        public void Dispose()
-        {
-            Array.Clear(this.array, 0, this.index);
-
-            ArrayPool<T>.Shared.Return(this.array);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/ConditionalWeakTable2{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/ConditionalWeakTable2{TKey,TValue}.cs
deleted file mode 100644
index 9a5b0acfe32..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/ConditionalWeakTable2{TKey,TValue}.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.
-
-#if NETSTANDARD2_0
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Mvvm.Messaging.Internals
-{
-    /// <summary>
-    /// A wrapper for <see cref="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 ConditionalWeakTable2<TKey, TValue>
-        where TKey : class
-        where TValue : class?
-    {
-        /// <summary>
-        /// The underlying <see cref="ConditionalWeakTable{TKey,TValue}"/> instance.
-        /// </summary>
-        private readonly ConditionalWeakTable<TKey, TValue> table = new();
-
-        /// <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 = new();
-
-        /// <inheritdoc cref="ConditionalWeakTable{TKey,TValue}.TryGetValue"/>
-        public bool TryGetValue(TKey key, [NotNullWhen(true)] out TValue? value)
-        {
-            return this.table.TryGetValue(key, out value);
-        }
-
-        /// <inheritdoc cref="ConditionalWeakTable{TKey,TValue}.GetValue"/>
-        public TValue GetValue(TKey key, 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="ConditionalWeakTable{TKey,TValue}.Remove"/>
-        public bool Remove(TKey key)
-        {
-            return this.table.Remove(key);
-        }
-
-        /// <inheritdoc cref="IEnumerable{T}.GetEnumerator"/>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Enumerator GetEnumerator() => new(this);
-
-        /// <summary>
-        /// A custom enumerator that traverses items in a <see cref="ConditionalWeakTable{TKey, TValue}"/> instance.
-        /// </summary>
-        public ref struct Enumerator
-        {
-            /// <summary>
-            /// The owner <see cref="ConditionalWeakTable2{TKey, TValue}"/> instance for the enumerator.
-            /// </summary>
-            private readonly ConditionalWeakTable2<TKey, TValue> owner;
-
-            /// <summary>
-            /// The current <see cref="LinkedListNode{T}"/>, if any.
-            /// </summary>
-            private LinkedListNode<WeakReference<TKey>>? node;
-
-            /// <summary>
-            /// The current <see cref="KeyValuePair{TKey, TValue}"/> to return.
-            /// </summary>
-            private KeyValuePair<TKey, TValue> current;
-
-            /// <summary>
-            /// Indicates whether or not <see cref="MoveNext"/> has been called at least once.
-            /// </summary>
-            private bool isFirstMoveNextPending;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="Enumerator"/> struct.
-            /// </summary>
-            /// <param name="owner">The owner <see cref="ConditionalWeakTable2{TKey, TValue}"/> instance for the enumerator.</param>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public Enumerator(ConditionalWeakTable2<TKey, TValue> owner)
-            {
-                this.owner = owner;
-                this.node = null;
-                this.current = default;
-                this.isFirstMoveNextPending = true;
-            }
-
-            /// <inheritdoc cref="System.Collections.IEnumerator.MoveNext"/>
-            public bool MoveNext()
-            {
-                LinkedListNode<WeakReference<TKey>>? node;
-
-                if (!isFirstMoveNextPending)
-                {
-                    node = this.node!.Next;
-                }
-                else
-                {
-                    node = this.owner.keys.First;
-
-                    this.isFirstMoveNextPending = false;
-                }
-
-                while (node is not null)
-                {
-                    LinkedListNode<WeakReference<TKey>>? nextNode = node.Next;
-
-                    // Get the key and value for the current node
-                    if (node.Value.TryGetTarget(out TKey? target) &&
-                        this.owner.table.TryGetValue(target!, out TValue? value))
-                    {
-                        this.node = node;
-                        this.current = new KeyValuePair<TKey, TValue>(target, value);
-
-                        return true;
-                    }
-                    else
-                    {
-                        // If the current key has been collected, trim the list
-                        this.owner.keys.Remove(node);
-                    }
-
-                    node = nextNode;
-                }
-
-                return false;
-            }
-
-            /// <inheritdoc cref="System.Collections.IEnumerator.MoveNext"/>
-            public readonly KeyValuePair<TKey, TValue> Current
-            {
-                [MethodImpl(MethodImplOptions.AggressiveInlining)]
-                get => this.current;
-            }
-        }
-    }
-}
-
-#endif
\ No newline at end of file
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
deleted file mode 100644
index 3c8d0e8b057..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/DictionarySlim{TKey,TValue}.cs
+++ /dev/null
@@ -1,407 +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.
-
-#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.Diagnostics.CodeAnalysis;
-using System.Diagnostics.Contracts;
-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. 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}"/> 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 class DictionarySlim<TKey, TValue> : IDictionarySlim<TKey, TValue>
-        where TKey : IEquatable<TKey>
-        where TValue : class
-    {
-        /// <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;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DictionarySlim{TKey, TValue}"/> class.
-        /// </summary>
-        public DictionarySlim()
-        {
-            this.buckets = HashHelpers.SizeOneIntArray;
-            this.entries = InitialEntries;
-        }
-
-        /// <inheritdoc/>
-        public int Count => this.count;
-
-        /// <inheritdoc/>
-        public TValue this[TKey key]
-        {
-            get
-            {
-                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)
-                {
-                    if (key.Equals(entries[i].Key))
-                    {
-                        return entries[i].Value!;
-                    }
-                }
-
-                ThrowArgumentExceptionForKeyNotFound(key);
-
-                return default!;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Clear()
-        {
-            this.count = 0;
-            this.freeList = -1;
-            this.buckets = HashHelpers.SizeOneIntArray;
-            this.entries = InitialEntries;
-        }
-
-        /// <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;
-
-            for (int i = this.buckets[key.GetHashCode() & (this.buckets.Length - 1)] - 1;
-                 (uint)i < (uint)entries.Length;
-                 i = entries[i].Next)
-            {
-                if (key.Equals(entries[i].Key))
-                {
-                    return true;
-                }
-            }
-
-            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, [NotNullWhen(true)] out TValue? value)
-        {
-            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)
-            {
-                if (key.Equals(entries[i].Key))
-                {
-                    value = entries[i].Value!;
-
-                    return true;
-                }
-            }
-
-            value = default!;
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public bool TryRemove(TKey key)
-        {
-            Entry[] entries = this.entries;
-            int bucketIndex = key.GetHashCode() & (this.buckets.Length - 1);
-            int entryIndex = this.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
-                    {
-                        this.buckets[bucketIndex] = candidate.Next + 1;
-                    }
-
-                    entries[entryIndex] = default;
-                    entries[entryIndex].Next = -3 - this.freeList;
-
-                    this.freeList = entryIndex;
-                    this.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 = this.entries;
-            int bucketIndex = key.GetHashCode() & (this.buckets.Length - 1);
-
-            for (int i = this.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);
-        }
-
-        /// <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)
-        {
-            Entry[] entries = this.entries;
-            int entryIndex;
-
-            if (this.freeList != -1)
-            {
-                entryIndex = this.freeList;
-
-                this.freeList = -3 - entries[this.freeList].Next;
-            }
-            else
-            {
-                if (this.count == entries.Length || entries.Length == 1)
-                {
-                    entries = Resize();
-                    bucketIndex = key.GetHashCode() & (this.buckets.Length - 1);
-                }
-
-                entryIndex = this.count;
-            }
-
-            entries[entryIndex].Key = key;
-            entries[entryIndex].Next = this.buckets[bucketIndex] - 1;
-
-            this.buckets[bucketIndex] = entryIndex + 1;
-            this.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 = this.count;
-            int newSize = this.entries.Length * 2;
-
-            if ((uint)newSize > int.MaxValue)
-            {
-                ThrowInvalidOperationExceptionForMaxCapacityExceeded();
-            }
-
-            var entries = new Entry[newSize];
-
-            Array.Copy(this.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;
-            }
-
-            this.buckets = newBuckets;
-            this.entries = entries;
-
-            return entries;
-        }
-
-        /// <inheritdoc cref="IEnumerable{T}.GetEnumerator"/>
-        [Pure]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Enumerator GetEnumerator() => new(this);
-
-        /// <summary>
-        /// Enumerator for <see cref="DictionarySlim{TKey,TValue}"/>.
-        /// </summary>
-        public ref struct Enumerator
-        {
-            private readonly Entry[] entries;
-            private int index;
-            private int count;
-
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            internal Enumerator(DictionarySlim<TKey, TValue> dictionary)
-            {
-                this.entries = dictionary.entries;
-                this.index = 0;
-                this.count = dictionary.count;
-            }
-
-            /// <inheritdoc cref="IEnumerator.MoveNext"/>
-            public bool MoveNext()
-            {
-                if (this.count == 0)
-                {
-                    return false;
-                }
-
-                this.count--;
-
-                Entry[] entries = this.entries;
-
-                while (entries[this.index].Next < -1)
-                {
-                    this.index++;
-                }
-
-                // 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;
-            }
-
-            /// <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.entries[this.index - 1].Value!;
-            }
-        }
-
-        /// <summary>
-        /// Throws an <see cref="ArgumentException"/> when trying to load an element with a missing key.
-        /// </summary>
-        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>
-        private static void ThrowInvalidOperationExceptionForMaxCapacityExceeded()
-        {
-            throw new InvalidOperationException("Max capacity exceeded");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/HashHelpers.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/HashHelpers.cs
deleted file mode 100644
index 3062f15ce7f..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/HashHelpers.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.Collections.Extensions
-{
-    /// <summary>
-    /// A helper class for <see cref="DictionarySlim{TKey,TValue}"/>.
-    /// </summary>
-    internal static class HashHelpers
-    {
-        /// <summary>
-        /// An array of type <see cref="int"/> of size 1.
-        /// </summary>
-        public static readonly int[] SizeOneIntArray = new int[1];
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim.cs
deleted file mode 100644
index 16c7571cd1d..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim.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.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();
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.cs
deleted file mode 100644
index 011cf98a938..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim{TKey,TValue}.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.
-
-using System;
-
-namespace Microsoft.Collections.Extensions
-{
-    /// <summary>
-    /// An interface providing key type contravariant and value type covariant access
-    /// to a <see cref="DictionarySlim{TKey,TValue}"/> instance.
-    /// </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> : IDictionarySlim<TKey>
-        where TKey : IEquatable<TKey>
-        where TValue : class
-    {
-        /// <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; }
-    }
-}
\ No newline at end of file
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
deleted file mode 100644
index edbae01b6b1..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Microsoft.Collections.Extensions/IDictionarySlim{TKey}.cs
+++ /dev/null
@@ -1,23 +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.Collections.Extensions
-{
-    /// <summary>
-    /// 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> : IDictionarySlim
-        where TKey : IEquatable<TKey>
-    {
-        /// <summary>
-        /// Tries to remove a value with a specified key, if present.
-        /// </summary>
-        /// <param name="key">The key of the value to remove.</param>
-        /// <returns>Whether or not the key was present.</returns>
-        bool TryRemove(TKey key);
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/System/Gen2GcCallback.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/System/Gen2GcCallback.cs
deleted file mode 100644
index 649de08eff9..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/System/Gen2GcCallback.cs
+++ /dev/null
@@ -1,84 +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.Runtime.ConstrainedExecution;
-using System.Runtime.InteropServices;
-
-namespace System
-{
-    /// <summary>
-    /// Schedules a callback roughly every gen 2 GC (you may see a Gen 0 an Gen 1 but only once).
-    /// Ported from https://github.com/dotnet/runtime/blob/main/src/libraries/System.Private.CoreLib/src/System/Gen2GcCallback.cs.
-    /// </summary>
-    internal sealed class Gen2GcCallback : CriticalFinalizerObject
-    {
-        /// <summary>
-        /// The callback to invoke at each GC.
-        /// </summary>
-        private readonly Action<object> callback;
-
-        /// <summary>
-        /// A weak <see cref="GCHandle"/> to the target object to pass to <see cref="callback"/>.
-        /// </summary>
-        private GCHandle handle;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Gen2GcCallback"/> class.
-        /// </summary>
-        /// <param name="callback">The callback to invoke at each GC.</param>
-        /// <param name="target">The target object to pass as argument to <paramref name="callback"/>.</param>
-        private Gen2GcCallback(Action<object> callback, object target)
-        {
-            this.callback = callback;
-            this.handle = GCHandle.Alloc(target, GCHandleType.Weak);
-        }
-
-        /// <summary>
-        /// Schedules a callback to be called on each GC until the target is collected.
-        /// </summary>
-        /// <param name="callback">The callback to invoke at each GC.</param>
-        /// <param name="target">The target object to pass as argument to <paramref name="callback"/>.</param>
-        public static void Register(Action<object> callback, object target)
-        {
-#if NETSTANDARD2_0
-            if (RuntimeInformation.FrameworkDescription.StartsWith(".NET Framework"))
-            {
-                // On .NET Framework using a GC callback causes issues with app domain unloading,
-                // so the callback is not registered if that runtime is detected and just ignored.
-                // Users on .NET Framework will have to manually trim the messenger, if they'd like.
-                return;
-            }
-#endif
-
-            _ = new Gen2GcCallback(callback, target);
-        }
-
-        /// <summary>
-        /// Finalizes an instance of the <see cref="Gen2GcCallback"/> class.
-        /// This finalizer is re-registered with <see cref="GC.ReRegisterForFinalize(object)"/> as long as
-        /// the target object is alive, which means it will be executed again every time a generation 2
-        /// collection is triggered (as the <see cref="Gen2GcCallback"/> instance itself would be moved to
-        /// that generation after surviving the generation 0 and 1 collections the first time).
-        /// </summary>
-        ~Gen2GcCallback()
-        {
-            if (this.handle.Target is object target)
-            {
-                try
-                {
-                    this.callback(target);
-                }
-                catch
-                {
-                }
-
-                GC.ReRegisterForFinalize(this);
-            }
-            else
-            {
-                handle.Free();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Type2.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Type2.cs
deleted file mode 100644
index 59126181114..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Type2.cs
+++ /dev/null
@@ -1,83 +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 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()
-        {
-            // To combine the two hashes, we can simply use the fast djb2 hash algorithm. Unfortunately we
-            // can't really skip the callvirt here (eg. by using RuntimeHelpers.GetHashCode like in other
-            // cases), as there are some niche cases mentioned above that might break when doing so.
-            // However since this method is not generally used in a hot path (eg. the message broadcasting
-            // only invokes this a handful of times when initially retrieving the target mapping), this
-            // doesn't actually make a noticeable difference despite the minor overhead of the virtual call.
-            int hash = TMessage.GetHashCode();
-
-            hash = (hash << 5) + hash;
-
-            hash += TToken.GetHashCode();
-
-            return hash;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Unit.cs b/Microsoft.Toolkit.Mvvm/Messaging/Internals/Unit.cs
deleted file mode 100644
index a0f5d7ea7ee..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Internals/Unit.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;
-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;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs
deleted file mode 100644
index f31317f95b6..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncCollectionRequestMessage{T}.cs
+++ /dev/null
@@ -1,143 +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.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>
-    {
-        /// <summary>
-        /// 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>
-        private readonly List<(Task<T>?, Func<CancellationToken, Task<T>>?)> responses = new();
-
-        /// <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();
-
-        /// <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, 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));
-        }
-
-        /// <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(this.responses.Count);
-
-            await foreach (var response in this.WithCancellation(cancellationToken).ConfigureAwait(false))
-            {
-                results.Add(response);
-            }
-
-            return results;
-        }
-
-        /// <inheritdoc/>
-        [Pure]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public async IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken = default)
-        {
-            if (cancellationToken.CanBeCanceled)
-            {
-                _ = cancellationToken.Register(this.cancellationTokenSource.Cancel);
-            }
-
-            foreach (var (task, func) in this.responses)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    yield break;
-                }
-
-                if (task is not null)
-                {
-                    yield return await task.ConfigureAwait(false);
-                }
-                else
-                {
-                    yield return await func!(cancellationToken).ConfigureAwait(false);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs
deleted file mode 100644
index a857b0ce774..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/AsyncRequestMessage{T}.cs
+++ /dev/null
@@ -1,95 +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.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>
-    {
-        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
-            {
-                if (!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)
-        {
-            if (HasReceivedResponse)
-            {
-                ThrowInvalidOperationExceptionForDuplicateReply();
-            }
-
-            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");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/CollectionRequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/CollectionRequestMessage{T}.cs
deleted file mode 100644
index 2f4e95308b8..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/CollectionRequestMessage{T}.cs
+++ /dev/null
@@ -1,50 +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;
-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 List<T> responses = new();
-
-        /// <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();
-        }
-    }
-}
\ 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
deleted file mode 100644
index 075ed306a00..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/PropertyChangedMessage{T}.cs
+++ /dev/null
@@ -1,53 +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.
-
-#pragma warning disable SA1512
-
-// 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
-{
-    /// <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)
-        {
-            Sender = sender;
-            PropertyName = propertyName;
-            OldValue = oldValue;
-            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
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
deleted file mode 100644
index 0a6ee08f2af..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/RequestMessage{T}.cs
+++ /dev/null
@@ -1,84 +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;
-
-#pragma warning disable CS8618
-
-namespace Microsoft.Toolkit.Mvvm.Messaging.Messages
-{
-    /// <summary>
-    /// 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 class RequestMessage<T>
-    {
-        private T response;
-
-        /// <summary>
-        /// Gets the message response.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">Thrown when <see cref="HasReceivedResponse"/> is <see langword="false"/>.</exception>
-        public T Response
-        {
-            get
-            {
-                if (!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)
-        {
-            if (HasReceivedResponse)
-            {
-                ThrowInvalidOperationExceptionForDuplicateReply();
-            }
-
-            HasReceivedResponse = true;
-
-            this.response = response;
-        }
-
-        /// <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="HasReceivedResponse"/> is <see langword="false"/>.</exception>
-        public static implicit operator T(RequestMessage<T> message)
-        {
-            return message.Response;
-        }
-
-        /// <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"/> is called twice.
-        /// </summary>
-        private static void ThrowInvalidOperationExceptionForDuplicateReply()
-        {
-            throw new InvalidOperationException("A response has already been issued for the current message");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/Messages/ValueChangedMessage{T}.cs b/Microsoft.Toolkit.Mvvm/Messaging/Messages/ValueChangedMessage{T}.cs
deleted file mode 100644
index 5d0ce62c916..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/Messages/ValueChangedMessage{T}.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.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
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs
deleted file mode 100644
index cbaa2799b85..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/StrongReferenceMessenger.cs
+++ /dev/null
@@ -1,578 +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.Buffers;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using Microsoft.Collections.Extensions;
-using Microsoft.Toolkit.Mvvm.Messaging.Internals;
-
-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 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 StrongReferenceMessenger : IMessenger
-    {
-        // This messenger uses the following logic to link stored instances together:
-        // --------------------------------------------------------------------------------------------------------
-        // DictionarySlim<Recipient, HashSet<IMapping>> recipientsMap;
-        //                    |                   \________________[*]IDictionarySlim<Recipient, IDictionarySlim<TToken>>
-        //                    |                                             \____________/_________                /
-        //                    |   ________(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 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
-        // 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, 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 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="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>
-        private readonly DictionarySlim<Recipient, HashSet<IMapping>> recipientsMap = new();
-
-        /// <summary>
-        /// The <see cref="Mapping{TMessage,TToken}"/> instance for types combination.
-        /// </summary>
-        /// <remarks>
-        /// 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, IMapping> typesMap = new();
-
-        /// <summary>
-        /// Gets the default <see cref="StrongReferenceMessenger"/> instance.
-        /// </summary>
-        public static StrongReferenceMessenger Default { get; } = new();
-
-        /// <inheritdoc/>
-        public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
-            where TMessage : class
-            where TToken : IEquatable<TToken>
-        {
-            lock (this.recipientsMap)
-            {
-                if (!TryGetMapping(out Mapping<TMessage, TToken>? mapping))
-                {
-                    return false;
-                }
-
-                Recipient key = new(recipient);
-
-                return mapping.ContainsKey(key);
-            }
-        }
-
-        /// <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)
-            {
-                // Get the <TMessage, TToken> registration list for this recipient
-                Mapping<TMessage, TToken> mapping = GetOrAddMapping<TMessage, TToken>();
-                Recipient key = new(recipient);
-                ref DictionarySlim<TToken, object>? map = ref mapping.GetOrAddValueRef(key);
-
-                map ??= new DictionarySlim<TToken, object>();
-
-                // Add the new registration entry
-                ref object? registeredHandler = ref map.GetOrAddValueRef(token);
-
-                if (registeredHandler is not null)
-                {
-                    ThrowInvalidOperationExceptionForDuplicateRegistration();
-                }
-
-                // Treat the input delegate as if it was covariant (see comments below in the Send method)
-                registeredHandler = handler;
-
-                // 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(mapping);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void UnregisterAll(object recipient)
-        {
-            lock (this.recipientsMap)
-            {
-                // If the recipient has no registered messages at all, ignore
-                Recipient key = new(recipient);
-
-                if (!this.recipientsMap.TryGetValue(key, out HashSet<IMapping>? set))
-                {
-                    return;
-                }
-
-                // Removes all the lists of registered handlers for the recipient
-                foreach (IMapping mapping in set)
-                {
-                    if (mapping.TryRemove(key) &&
-                        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);
-                    }
-                }
-
-                // Remove the associated set in the recipients map
-                _ = this.recipientsMap.TryRemove(key);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void UnregisterAll<TToken>(object recipient, TToken token)
-            where TToken : IEquatable<TToken>
-        {
-            bool lockTaken = false;
-            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
-            // 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
-                Recipient key = new(recipient);
-
-                if (!this.recipientsMap.TryGetValue(key, out HashSet<IMapping>? 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. 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)
-                {
-                    // Select all mappings using the same token type
-                    if (item is IDictionarySlim<Recipient, IDictionarySlim<TToken>> 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 (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.
-                    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.TryRemove(token) &&
-                        holder.Count == 0)
-                    {
-                        // If the map is empty, remove the recipient entirely from its container
-                        _ = map.TryRemove(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 UnregisterAll(recipient).
-                        if (map.Count == 0 &&
-                            set.Remove(Unsafe.As<IMapping>(map)) &&
-                            set.Count == 0)
-                        {
-                            _ = this.recipientsMap.TryRemove(key);
-                        }
-                    }
-                }
-            }
-            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 not null)
-                {
-                    maps.AsSpan(0, i).Clear();
-
-                    ArrayPool<object>.Shared.Return(maps);
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Unregister<TMessage, TToken>(object recipient, TToken token)
-            where TMessage : class
-            where TToken : IEquatable<TToken>
-        {
-            lock (this.recipientsMap)
-            {
-                // Get the registration list, if available
-                if (!TryGetMapping(out Mapping<TMessage, TToken>? mapping))
-                {
-                    return;
-                }
-
-                Recipient key = new(recipient);
-
-                if (!mapping.TryGetValue(key, out DictionarySlim<TToken, object>? dictionary))
-                {
-                    return;
-                }
-
-                // Remove the target handler
-                if (dictionary.TryRemove(token) &&
-                    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).
-                    _ = mapping.TryRemove(key);
-
-                    HashSet<IMapping> set = this.recipientsMap[key];
-
-                    if (set.Remove(mapping) &&
-                        set.Count == 0)
-                    {
-                        _ = this.recipientsMap.TryRemove(key);
-                    }
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
-            where TMessage : class
-            where TToken : IEquatable<TToken>
-        {
-            object[] rentedArray;
-            Span<object> pairs;
-            int i = 0;
-
-            lock (this.recipientsMap)
-            {
-                // 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.
-                // 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)
-                {
-                    return message;
-                }
-
-                // 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
-                // 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 handler in the rented buffer.
-                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())
-                {
-                    // Pick the target handler, if the token is a match for the recipient
-                    if (mappingEnumerator.Value.TryGetValue(token, out object? handler))
-                    {
-                        // 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 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[2 * i] = handler;
-                        pairs[(2 * i) + 1] = mappingEnumerator.Key.Target;
-                        i++;
-                    }
-                }
-            }
-
-            try
-            {
-                // Invoke all the necessary handlers on the local copy of entries
-                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>>(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.
-                Array.Clear(rentedArray, 0, 2 * i);
-
-                ArrayPool<object>.Shared.Return(rentedArray);
-            }
-
-            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()
-        {
-            lock (this.recipientsMap)
-            {
-                this.recipientsMap.Clear();
-                this.typesMap.Clear();
-            }
-        }
-
-        /// <summary>
-        /// 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>
-        /// <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>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private bool TryGetMapping<TMessage, TToken>([NotNullWhen(true)] out Mapping<TMessage, TToken>? mapping)
-            where TMessage : class
-            where TToken : IEquatable<TToken>
-        {
-            Type2 key = new(typeof(TMessage), typeof(TToken));
-
-            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.
-                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>
-        {
-            Type2 key = new(typeof(TMessage), typeof(TToken));
-            ref IMapping? target = ref this.typesMap.GetOrAddValueRef(key);
-
-            target ??= new Mapping<TMessage, TToken>();
-
-            return Unsafe.As<Mapping<TMessage, TToken>>(target);
-        }
-
-        /// <summary>
-        /// 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>
-        /// <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, object>>, 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>
-        /// 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>
-            public 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)
-            {
-                Target = target;
-            }
-
-            /// <inheritdoc/>
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public bool Equals(Recipient other)
-            {
-                return ReferenceEquals(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>
-        /// 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");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs b/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
deleted file mode 100644
index 231dc9d1870..00000000000
--- a/Microsoft.Toolkit.Mvvm/Messaging/WeakReferenceMessenger.cs
+++ /dev/null
@@ -1,363 +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.Runtime.CompilerServices;
-using System.Threading;
-using Microsoft.Collections.Extensions;
-using Microsoft.Toolkit.Mvvm.Messaging.Internals;
-#if NETSTANDARD2_0
-using RecipientsTable = Microsoft.Toolkit.Mvvm.Messaging.Internals.ConditionalWeakTable2<object, Microsoft.Collections.Extensions.IDictionarySlim>;
-#else
-using RecipientsTable = System.Runtime.CompilerServices.ConditionalWeakTable<object, Microsoft.Collections.Extensions.IDictionarySlim>;
-#endif
-
-#pragma warning disable SA1204
-
-namespace Microsoft.Toolkit.Mvvm.Messaging
-{
-    /// <summary>
-    /// A class providing a reference implementation for the <see cref="IMessenger"/> interface.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// 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.
-    /// </para>
-    /// <para>
-    /// The <see cref="WeakReferenceMessenger"/> type will automatically perform internal trimming when
-    /// full GC collections are invoked, so calling <see cref="Cleanup"/> manually is not necessary to
-    /// ensure that on average the internal data structures are as trimmed and compact as possible.
-    /// Note: this is not supported when running on .NET Framework, due to app domain unloading issues.
-    /// </para>
-    /// </remarks>
-    public sealed class WeakReferenceMessenger : IMessenger
-    {
-        // This messenger 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, RecipientsTable> recipientsMap = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WeakReferenceMessenger"/> class.
-        /// </summary>
-        public WeakReferenceMessenger()
-        {
-            // Proxy function for the GC callback. This needs to be static and to take the target instance as
-            // an input parameter in order to avoid rooting it from the Gen2GcCallback object invoking it.
-            static void Gen2GcCallbackProxy(object target)
-            {
-                ((WeakReferenceMessenger)target).CleanupWithNonBlockingLock();
-            }
-
-            // Register an automatic GC callback to trigger a non-blocking cleanup. This will ensure that the
-            // current messenger instance is trimmed and without leftover recipient maps that are no longer used.
-            // This is necessary (as in, some form of cleanup, either explicit or automatic like in this case)
-            // because the ConditionalWeakTable<TKey, TValue> instances will just remove key-value pairs on their
-            // own as soon as a key (ie. a recipient) is collected, causing their own keys (ie. the Type2 instances
-            // mapping to each conditional table for a pair of message and token types) to potentially remain in the
-            // root mapping structure but without any remaining recipients actually registered there, which just
-            // adds unnecessary overhead when trying to enumerate recipients during broadcasting operations later on.
-            Gen2GcCallback.Register(Gen2GcCallbackProxy, this);
-        }
-
-        /// <summary>
-        /// Gets the default <see cref="WeakReferenceMessenger"/> instance.
-        /// </summary>
-        public static WeakReferenceMessenger Default { get; } = new();
-
-        /// <inheritdoc/>
-        public bool IsRegistered<TMessage, TToken>(object recipient, TToken token)
-            where TMessage : class
-            where TToken : IEquatable<TToken>
-        {
-            lock (this.recipientsMap)
-            {
-                Type2 type2 = new(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 RecipientsTable? table) &&
-                    table.TryGetValue(recipient, out IDictionarySlim? mapping) &&
-                    Unsafe.As<DictionarySlim<TToken, object>>(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(typeof(TMessage), typeof(TToken));
-
-                // Get the conditional table for the pair of type arguments, or create it if it doesn't exist
-                ref RecipientsTable? mapping = ref this.recipientsMap.GetOrAddValueRef(type2);
-
-                mapping ??= new RecipientsTable();
-
-                // Get or create the handlers dictionary for the target recipient
-                var map = Unsafe.As<DictionarySlim<TToken, object>>(mapping.GetValue(recipient, static _ => new DictionarySlim<TToken, object>()));
-
-                // Add the new registration entry
-                ref object? registeredHandler = ref map.GetOrAddValueRef(token);
-
-                if (registeredHandler is not 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 responsibility 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<DictionarySlim<TToken, object>>(mapping).TryRemove(token);
-                    }
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Unregister<TMessage, TToken>(object recipient, TToken token)
-            where TMessage : class
-            where TToken : IEquatable<TToken>
-        {
-            lock (this.recipientsMap)
-            {
-                Type2 type2 = new(typeof(TMessage), typeof(TToken));
-
-                // Get the target mapping table for the combination of message and token types,
-                // and remove the handler with a matching token (the entire map), if present.
-                if (this.recipientsMap.TryGetValue(type2, out RecipientsTable? value) &&
-                    value.TryGetValue(recipient, out IDictionarySlim? mapping))
-                {
-                    _ = Unsafe.As<DictionarySlim<TToken, object>>(mapping).TryRemove(token);
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public TMessage Send<TMessage, TToken>(TMessage message, TToken token)
-            where TMessage : class
-            where TToken : IEquatable<TToken>
-        {
-            ArrayPoolBufferWriter<object> bufferWriter;
-            int i = 0;
-
-            lock (this.recipientsMap)
-            {
-                Type2 type2 = new(typeof(TMessage), typeof(TToken));
-
-                // Try to get the target table
-                if (!this.recipientsMap.TryGetValue(type2, out RecipientsTable? table))
-                {
-                    return message;
-                }
-
-                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
-                // 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))
-                    {
-                        bufferWriter.Add(handler);
-                        bufferWriter.Add(pair.Key);
-                        i++;
-                    }
-                }
-            }
-
-            try
-            {
-                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>>(pairs[2 * j])(pairs[(2 * j) + 1], message);
-                }
-            }
-            finally
-            {
-                bufferWriter.Dispose();
-            }
-
-            return message;
-        }
-
-        /// <inheritdoc/>
-        public void Cleanup()
-        {
-            lock (this.recipientsMap)
-            {
-                CleanupWithoutLock();
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Reset()
-        {
-            lock (this.recipientsMap)
-            {
-                this.recipientsMap.Clear();
-            }
-        }
-
-        /// <summary>
-        /// Executes a cleanup without locking the current instance. This method has to be
-        /// invoked when a lock on <see cref="recipientsMap"/> has already been acquired.
-        /// </summary>
-        private void CleanupWithNonBlockingLock()
-        {
-            object lockObject = this.recipientsMap;
-            bool lockTaken = false;
-
-            try
-            {
-                Monitor.TryEnter(lockObject, ref lockTaken);
-
-                if (lockTaken)
-                {
-                    CleanupWithoutLock();
-                }
-            }
-            finally
-            {
-                if (lockTaken)
-                {
-                    Monitor.Exit(lockObject);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Executes a cleanup without locking the current instance. This method has to be
-        /// invoked when a lock on <see cref="recipientsMap"/> has already been acquired.
-        /// </summary>
-        private void CleanupWithoutLock()
-        {
-            using ArrayPoolBufferWriter<Type2> type2s = ArrayPoolBufferWriter<Type2>.Create();
-            using ArrayPoolBufferWriter<object> emptyRecipients = ArrayPoolBufferWriter<object>.Create();
-
-            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.TryRemove(key);
-            }
-        }
-
-        /// <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");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
deleted file mode 100644
index efa6bad4691..00000000000
--- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
+++ /dev/null
@@ -1,56 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Nullable>Enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <Title>Windows Community Toolkit - MVVM (.NET Standard)</Title>
-    <Description>
-      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.
-      - ObservableValidator: a base class for objects implementing the INotifyDataErrorInfo interface.
-      - RelayCommand: a simple delegate command implementing the ICommand interface.
-      - AsyncRelayCommand: a delegate command supporting asynchronous operations and cancellation.
-      - WeakReferenceMessenger: a messaging system to exchange messages through different loosely-coupled objects.
-      - StrongReferenceMessenger: a high-performance messaging system that trades weak references for speed.
-      - Ioc: a helper class to configure dependency injection service containers.
-    </Description>
-    <PackageTags>MVVM;Toolkit;MVVMToolkit;INotifyPropertyChanged;Observable;IOC;DI;Dependency Injection;Object Messaging;Extensions;Helpers</PackageTags>
-    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);CopyAnalyzerProjectReferencesToPackage</TargetsForTfmSpecificContentInPackage>
-  </PropertyGroup>
-
-  <!-- .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="5.0.0" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Memory" Version="4.5.4" />
-  </ItemGroup>
-
-  <!-- .NET Standard 2.1 doesn't have the Unsafe type -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
-  </ItemGroup>
-    
-  <!-- Source generator project reference for packing -->
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Toolkit.Mvvm.SourceGenerators\Microsoft.Toolkit.Mvvm.SourceGenerators.csproj" PrivateAssets="all" />
-  </ItemGroup>
-
-  <!-- Target to pack the source generator into the "analyzers\dotnet\cs" package folder.
-       The condition is set to .NET Standard 2.0 so that the analyzer is only added to the package
-       when that target is being built, instead of once for all three targets, which would fail.
-       It will still be available for all targets anyway though, as analyzers don't have a target. -->
-  <Target Name="CopyAnalyzerProjectReferencesToPackage" DependsOnTargets="BuildOnlySettings;ResolveReferences" Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <ItemGroup>
-      <TfmSpecificPackageFile Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'All'))">
-        <PackagePath>analyzers\dotnet\cs</PackagePath>
-      </TfmSpecificPackageFile>
-    </ItemGroup>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs b/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs
index de1fd087f53..1386027af70 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Toolkit.Helpers;
 using Microsoft.Toolkit.Parsers.Markdown;
 using Microsoft.Toolkit.Parsers.Markdown.Blocks;
 using Microsoft.Toolkit.Parsers.Markdown.Inlines;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index 0a9bf08f523..2018763e733 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -105,6 +105,9 @@
     <PackageReference Include="Microsoft.Services.Store.Engagement">
       <Version>10.1901.28001</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit">
+      <Version>7.1.2</Version>
+    </PackageReference>
     <!-- TODO Reintroduce graph controls
     <PackageReference Include="Microsoft.Toolkit.Graph.Controls">
       <Version>6.1.0-build.6</Version>
@@ -1476,10 +1479,6 @@
       <Project>{75f9ee44-3efa-47bc-aedd-351b9834a0af}</Project>
       <Name>Microsoft.Toolkit.Uwp.UI.Media</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Toolkit\Microsoft.Toolkit.csproj">
-      <Project>{6fe128a8-cefa-4a61-a987-ec92de6b538e}</Project>
-      <Name>Microsoft.Toolkit</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>
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
index e26a5076895..59aa0e3386f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs
@@ -20,7 +20,6 @@
 // TODO Reintroduce graph controls
 // using Microsoft.Toolkit.Graph.Converters;
 // using Microsoft.Toolkit.Graph.Providers;
-using Microsoft.Toolkit.Helpers;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.Input.GazeInteraction;
 using Microsoft.Toolkit.Uwp.SampleApp.Models;
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs
index 8170fb9f29c..682ddb7848f 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Samples.cs
@@ -9,7 +9,6 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Helpers;
 using Microsoft.Toolkit.Uwp.Helpers;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Incremental Loading Collection/PeopleSource.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Incremental Loading Collection/PeopleSource.cs
index 0f70326813d..7050929464b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Incremental Loading Collection/PeopleSource.cs	
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Incremental Loading Collection/PeopleSource.cs	
@@ -7,14 +7,15 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Collections;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
     /// <summary>
-    /// A sample implementation of the <see cref="Collections.IIncrementalSource{TSource}"/> interface.
+    /// A sample implementation of the <see cref="IIncrementalSource{TSource}"/> interface.
     /// </summary>
-    /// <seealso cref="Collections.IIncrementalSource{TSource}"/>
-    public class PeopleSource : Collections.IIncrementalSource<Person>
+    /// <seealso cref="IIncrementalSource{TSource}"/>
+    public class PeopleSource : IIncrementalSource<Person>
     {
         private readonly List<Person> _people;
 
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Object Storage/ObjectStoragePage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Object Storage/ObjectStoragePage.xaml.cs
index 9bc0b00df04..26573dafc49 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Object Storage/ObjectStoragePage.xaml.cs	
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Object Storage/ObjectStoragePage.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 Microsoft.Toolkit.Helpers;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Windows.UI.Xaml;
 
diff --git a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
index 276b8de7388..c9881ebd4c0 100644
--- a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
+++ b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
@@ -49,6 +49,10 @@
     <PackageTags>UI;XAML;ApplicationView;FrameworkElement;ListView;SurfaceDial;Matrix;Mouse;TextBoxMask;TitleBar;VisualTree;Converters;Extensions;Helpers</PackageTags>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
   </ItemGroup>
diff --git a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.cs b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.cs
index 2bb537b5b52..c4624c0b799 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.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.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Helpers;
diff --git a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
index 7f2da09f7df..f344da945b7 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
@@ -66,7 +66,7 @@ public static ApplicationDataStorageHelper GetCurrent(Toolkit.Helpers.IObjectSer
         /// Get a new instance using the ApplicationData for the provided user and serializer.
         /// </summary>
         /// <param name="user">App data user owner.</param>
-        /// <param name="objectSerializer">Serializer for converting stored values. Defaults to <see cref="Toolkit.Helpers.SystemSerializer"/>.</param>
+        /// <param name="objectSerializer">Serializer for converting stored values. Defaults to <see cref="SystemSerializer"/>.</param>
         /// <returns>A new instance of ApplicationDataStorageHelper.</returns>
         public static async Task<ApplicationDataStorageHelper> GetForUserAsync(User user, Toolkit.Helpers.IObjectSerializer? objectSerializer = null)
         {
diff --git a/Microsoft.Toolkit.Uwp/Helpers/SystemInformation.cs b/Microsoft.Toolkit.Uwp/Helpers/SystemInformation.cs
index d55ccddccdc..84cf7c66acb 100644
--- a/Microsoft.Toolkit.Uwp/Helpers/SystemInformation.cs
+++ b/Microsoft.Toolkit.Uwp/Helpers/SystemInformation.cs
@@ -6,7 +6,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Helpers;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.Security.ExchangeActiveSyncProvisioning;
diff --git a/Microsoft.Toolkit.Uwp/IncrementalLoadingCollection/IncrementalLoadingCollection.cs b/Microsoft.Toolkit.Uwp/IncrementalLoadingCollection/IncrementalLoadingCollection.cs
index de5eb12721e..5739d43ec1a 100644
--- a/Microsoft.Toolkit.Uwp/IncrementalLoadingCollection/IncrementalLoadingCollection.cs
+++ b/Microsoft.Toolkit.Uwp/IncrementalLoadingCollection/IncrementalLoadingCollection.cs
@@ -28,7 +28,7 @@ namespace Microsoft.Toolkit.Uwp
     /// <seealso cref="ISupportIncrementalLoading"/>
     public class IncrementalLoadingCollection<TSource, IType> : ObservableCollection<IType>,
          ISupportIncrementalLoading
-         where TSource : Collections.IIncrementalSource<IType>
+         where TSource : IIncrementalSource<IType>
     {
         private readonly SemaphoreSlim _mutex = new SemaphoreSlim(1);
 
diff --git a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
index eff954a7bb1..4c1de1f5720 100644
--- a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
+++ b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Toolkit\Microsoft.Toolkit.csproj" />
+    <PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Attributes/NotNullIfNotNullAttribute.cs b/Microsoft.Toolkit/Attributes/NotNullIfNotNullAttribute.cs
deleted file mode 100644
index 8147f0bacfd..00000000000
--- a/Microsoft.Toolkit/Attributes/NotNullIfNotNullAttribute.cs
+++ /dev/null
@@ -1,29 +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.
-
-#if !NETSTANDARD2_1_OR_GREATER
-
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Specifies that the output will be non-null if the named parameter is non-null.
-    /// </summary>
-    /// <remarks>Internal copy from the BCL attribute.</remarks>
-    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple = true, Inherited = false)]
-    internal sealed class NotNullIfNotNullAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotNullIfNotNullAttribute"/> class.
-        /// </summary>
-        /// <param name="parameterName">The associated parameter name. The output will be non-null if the argument to the parameter specified is non-null.</param>
-        public NotNullIfNotNullAttribute(string parameterName) => ParameterName = parameterName;
-
-        /// <summary>
-        /// Gets the associated parameter name.
-        /// </summary>
-        public string ParameterName { get; }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Attributes/NotNullWhenAttribute.cs b/Microsoft.Toolkit/Attributes/NotNullWhenAttribute.cs
deleted file mode 100644
index cfd157016e4..00000000000
--- a/Microsoft.Toolkit/Attributes/NotNullWhenAttribute.cs
+++ /dev/null
@@ -1,29 +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.
-
-#if !NETSTANDARD2_1_OR_GREATER
-
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Specifies that when a method returns <see cref="ReturnValue"/>, the parameter will not be null even if the corresponding type allows it.
-    /// </summary>
-    /// <remarks>Internal copy from the BCL attribute.</remarks>
-    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
-    internal sealed class NotNullWhenAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotNullWhenAttribute"/> class.
-        /// </summary>
-        /// <param name="returnValue">The return value condition. If the method returns this value, the associated parameter will not be null.</param>
-        public NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
-
-        /// <summary>
-        /// Gets a value indicating whether the annotated variable is not <see langword="null"/>.
-        /// </summary>
-        public bool ReturnValue { get; }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Collections/IReadOnlyObservableGroup.cs b/Microsoft.Toolkit/Collections/IReadOnlyObservableGroup.cs
deleted file mode 100644
index e2eccfc9dbb..00000000000
--- a/Microsoft.Toolkit/Collections/IReadOnlyObservableGroup.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.
-
-using System.ComponentModel;
-
-namespace Microsoft.Toolkit.Collections
-{
-    /// <summary>
-    /// An interface for a grouped collection of items.
-    /// It allows us to use x:Bind with <see cref="ObservableGroup{TKey, TValue}"/> and <see cref="ReadOnlyObservableGroup{TKey, TValue}"/> by providing
-    /// a non-generic type that we can declare using x:DataType.
-    /// </summary>
-    public interface IReadOnlyObservableGroup : INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Gets the key for the current collection, as an <see cref="object"/>.
-        /// It is immutable.
-        /// </summary>
-        object Key { get; }
-
-        /// <summary>
-        /// Gets the number of items currently in the grouped collection.
-        /// </summary>
-        int Count { get; }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Collections/ObservableGroup.cs b/Microsoft.Toolkit/Collections/ObservableGroup.cs
deleted file mode 100644
index 0939c4aaaf9..00000000000
--- a/Microsoft.Toolkit/Collections/ObservableGroup.cs
+++ /dev/null
@@ -1,80 +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.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-
-namespace Microsoft.Toolkit.Collections
-{
-    /// <summary>
-    /// An observable group.
-    /// It associates a <see cref="Key"/> to an <see cref="ObservableCollection{T}"/>.
-    /// </summary>
-    /// <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 class ObservableGroup<TKey, TValue> : ObservableCollection<TValue>, IGrouping<TKey, TValue>, IReadOnlyObservableGroup
-        where TKey : notnull
-    {
-        /// <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.
-        /// </summary>
-        /// <param name="key">The key for the group.</param>
-        public ObservableGroup(TKey key)
-        {
-            this.key = key;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableGroup{TKey, TValue}"/> class.
-        /// </summary>
-        /// <param name="grouping">The grouping to fill the group.</param>
-        public ObservableGroup(IGrouping<TKey, TValue> grouping)
-            : base(grouping)
-        {
-            this.key = grouping.Key;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableGroup{TKey, TValue}"/> class.
-        /// </summary>
-        /// <param name="key">The key for the group.</param>
-        /// <param name="collection">The initial collection of data to add to the group.</param>
-        public ObservableGroup(TKey key, IEnumerable<TValue> collection)
-            : base(collection)
-        {
-            this.key = key;
-        }
-
-        private TKey key;
-
-        /// <summary>
-        /// Gets or sets the key of the group.
-        /// </summary>
-        public TKey Key
-        {
-            get => this.key;
-            set
-            {
-                if (!EqualityComparer<TKey>.Default.Equals(this.key!, value))
-                {
-                    this.key = value;
-
-                    OnPropertyChanged(KeyChangedEventArgs);
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        object IReadOnlyObservableGroup.Key => Key;
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Collections/ObservableGroupedCollection.cs b/Microsoft.Toolkit/Collections/ObservableGroupedCollection.cs
deleted file mode 100644
index 5cf36f0ad23..00000000000
--- a/Microsoft.Toolkit/Collections/ObservableGroupedCollection.cs
+++ /dev/null
@@ -1,50 +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.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Collections
-{
-    /// <summary>
-    /// An observable list of observable groups.
-    /// </summary>
-    /// <typeparam name="TKey">The type of the group key.</typeparam>
-    /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-    public sealed class ObservableGroupedCollection<TKey, TValue> : ObservableCollection<ObservableGroup<TKey, TValue>>
-        where TKey : notnull
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableGroupedCollection{TKey, TValue}"/> class.
-        /// </summary>
-        public ObservableGroupedCollection()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableGroupedCollection{TKey, TValue}"/> class.
-        /// </summary>
-        /// <param name="collection">The initial data to add in the grouped collection.</param>
-        public ObservableGroupedCollection(IEnumerable<IGrouping<TKey, TValue>> collection)
-            : base(collection.Select(static c => new ObservableGroup<TKey, TValue>(c)))
-        {
-        }
-
-        /// <summary>
-        /// Tries to get the underlying <see cref="List{T}"/> instance, if present.
-        /// </summary>
-        /// <param name="list">The resulting <see cref="List{T}"/>, if one was in use.</param>
-        /// <returns>Whether or not a <see cref="List{T}"/> instance has been found.</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal bool TryGetList([NotNullWhen(true)] out List<ObservableGroup<TKey, TValue>>? list)
-        {
-            list = Items as List<ObservableGroup<TKey, TValue>>;
-
-            return list is not null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Collections/ObservableGroupedCollectionExtensions.cs b/Microsoft.Toolkit/Collections/ObservableGroupedCollectionExtensions.cs
deleted file mode 100644
index 65eaef48272..00000000000
--- a/Microsoft.Toolkit/Collections/ObservableGroupedCollectionExtensions.cs
+++ /dev/null
@@ -1,451 +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.Contracts;
-using System.Linq;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Toolkit.Collections
-{
-    /// <summary>
-    /// The extensions methods to simplify the usage of <see cref="ObservableGroupedCollection{TKey, TValue}"/>.
-    /// </summary>
-    public static class ObservableGroupedCollectionExtensions
-    {
-        /// <summary>
-        /// Return the first group with <paramref name="key"/> key.
-        /// </summary>
-        /// <typeparam name="TKey">The type of the group key.</typeparam>
-        /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-        /// <param name="source">The source <see cref="ObservableGroupedCollection{TKey, TValue}"/> instance.</param>
-        /// <param name="key">The key of the group to query.</param>
-        /// <returns>The first group matching <paramref name="key"/>.</returns>
-        /// <exception cref="InvalidOperationException">The target group does not exist.</exception>
-        [Pure]
-        public static ObservableGroup<TKey, TValue> First<TKey, TValue>(this ObservableGroupedCollection<TKey, TValue> source, TKey key)
-            where TKey : notnull
-        {
-            ObservableGroup<TKey, TValue>? group = source.FirstOrDefault(key);
-
-            if (group is null)
-            {
-                static void ThrowArgumentExceptionForKeyNotFound()
-                {
-                    throw new InvalidOperationException("The requested key was not present in the collection");
-                }
-
-                ThrowArgumentExceptionForKeyNotFound();
-            }
-
-            return group!;
-        }
-
-        /// <summary>
-        /// Return the first group with <paramref name="key"/> key or null if not found.
-        /// </summary>
-        /// <typeparam name="TKey">The type of the group key.</typeparam>
-        /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-        /// <param name="source">The source <see cref="ObservableGroupedCollection{TKey, TValue}"/> instance.</param>
-        /// <param name="key">The key of the group to query.</param>
-        /// <returns>The first group matching <paramref name="key"/> or null.</returns>
-        [Pure]
-        public static ObservableGroup<TKey, TValue>? FirstOrDefault<TKey, TValue>(this ObservableGroupedCollection<TKey, TValue> source, TKey key)
-            where TKey : notnull
-        {
-            if (source.TryGetList(out var list))
-            {
-                foreach (var group in list)
-                {
-                    if (EqualityComparer<TKey>.Default.Equals(group.Key, key))
-                    {
-                        return group;
-                    }
-                }
-
-                return null;
-            }
-
-            // Fallback method
-            [MethodImpl(MethodImplOptions.NoInlining)]
-            static ObservableGroup<TKey, TValue>? FirstOrDefaultWithLinq(ObservableGroupedCollection<TKey, TValue> source, TKey key)
-            {
-                return source.FirstOrDefault(group => EqualityComparer<TKey>.Default.Equals(group.Key, key));
-            }
-
-            return FirstOrDefaultWithLinq(source, key);
-        }
-
-        /// <summary>
-        /// Return the element at position <paramref name="index"/> from the first group with <paramref name="key"/> key.
-        /// </summary>
-        /// <typeparam name="TKey">The type of the group key.</typeparam>
-        /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-        /// <param name="source">The source <see cref="ObservableGroupedCollection{TKey, TValue}"/> instance.</param>
-        /// <param name="key">The key of the group to query.</param>
-        /// <param name="index">The index of the item from the targeted group.</param>
-        /// <returns>The element.</returns>
-        /// <exception cref="InvalidOperationException">The target group does not exist.</exception>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is less than zero or <paramref name="index"/> is greater than the group elements' count.</exception>
-        [Pure]
-        public static TValue ElementAt<TKey, TValue>(
-            this ObservableGroupedCollection<TKey, TValue> source,
-            TKey key,
-            int index)
-            where TKey : notnull
-            => source.First(key)[index];
-
-        /// <summary>
-        /// Return the element at position <paramref name="index"/> from the first group with <paramref name="key"/> key.
-        /// </summary>
-        /// <typeparam name="TKey">The type of the group key.</typeparam>
-        /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-        /// <param name="source">The source <see cref="ObservableGroupedCollection{TKey, TValue}"/> instance.</param>
-        /// <param name="key">The key of the group to query.</param>
-        /// <param name="index">The index of the item from the targeted group.</param>
-        /// <returns>The element or default(TValue) if it does not exist.</returns>
-        [Pure]
-        public static TValue? ElementAtOrDefault<TKey, TValue>(
-            this ObservableGroupedCollection<TKey, TValue> source,
-            TKey key,
-            int index)
-            where TKey : notnull
-        {
-            var group = source.FirstOrDefault(key);
-
-            if (group is null ||
-                (uint)index >= (uint)group.Count)
-            {
-                return default;
-            }
-
-            return group[index];
-        }
-
-        /// <summary>
-        /// Adds a key-value <see cref="ObservableGroup{TKey, TValue}"/> item into a target <see cref="ObservableGroupedCollection{TKey, TValue}"/>.
-        /// </summary>
-        /// <typeparam name="TKey">The type of the group key.</typeparam>
-        /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-        /// <param name="source">The source <see cref="ObservableGroupedCollection{TKey, TValue}"/> instance.</param>
-        /// <param name="key">The key of the group where <paramref name="value"/> will be added.</param>
-        /// <param name="value">The value to add.</param>
-        /// <returns>The added <see cref="ObservableGroup{TKey, TValue}"/>.</returns>
-        public static ObservableGroup<TKey, TValue> AddGroup<TKey, TValue>(
-            this ObservableGroupedCollection<TKey, TValue> source,
-            TKey key,
-            TValue value)
-            where TKey : notnull
-            => AddGroup(source, key, new[] { value });
-
-        /// <summary>
-        /// Adds a key-collection <see cref="ObservableGroup{TKey, TValue}"/> item into a target <see cref="ObservableGroupedCollection{TKey, TValue}"/>.
-        /// </summary>
-        /// <typeparam name="TKey">The type of the group key.</typeparam>
-        /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-        /// <param name="source">The source <see cref="ObservableGroupedCollection{TKey, TValue}"/> instance.</param>
-        /// <param name="key">The key of the group where <paramref name="collection"/> will be added.</param>
-        /// <param name="collection">The collection to add.</param>
-        /// <returns>The added <see cref="ObservableGroup{TKey, TValue}"/>.</returns>
-        public static ObservableGroup<TKey, TValue> AddGroup<TKey, TValue>(
-            this ObservableGroupedCollection<TKey, TValue> source,
-            TKey key,
-            params TValue[] collection)
-            where TKey : notnull
-            => source.AddGroup(key, (IEnumerable<TValue>)collection);
-
-        /// <summary>
-        /// Adds a key-collection <see cref="ObservableGroup{TKey, TValue}"/> item into a target <see cref="ObservableGroupedCollection{TKey, TValue}"/>.
-        /// </summary>
-        /// <typeparam name="TKey">The type of the group key.</typeparam>
-        /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-        /// <param name="source">The source <see cref="ObservableGroupedCollection{TKey, TValue}"/> instance.</param>
-        /// <param name="key">The key of the group where <paramref name="collection"/> will be added.</param>
-        /// <param name="collection">The collection to add.</param>
-        /// <returns>The added <see cref="ObservableGroup{TKey, TValue}"/>.</returns>
-        public static ObservableGroup<TKey, TValue> AddGroup<TKey, TValue>(
-            this ObservableGroupedCollection<TKey, TValue> source,
-            TKey key,
-            IEnumerable<TValue> collection)
-            where TKey : notnull
-        {
-            var group = new ObservableGroup<TKey, TValue>(key, collection);
-            source.Add(group);
-
-            return group;
-        }
-
-        /// <summary>
-        /// Add <paramref name="item"/> into the first group with <paramref name="key"/> key.
-        /// If the group does not exist, it will be added.
-        /// </summary>
-        /// <typeparam name="TKey">The type of the group key.</typeparam>
-        /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-        /// <param name="source">The source <see cref="ObservableGroupedCollection{TKey, TValue}"/> instance.</param>
-        /// <param name="key">The key of the group where the <paramref name="item"/> should be added.</param>
-        /// <param name="item">The item to add.</param>
-        /// <returns>The instance of the <see cref="ObservableGroup{TKey, TValue}"/> which will receive the value. It will either be an existing group or a new group.</returns>
-        public static ObservableGroup<TKey, TValue> AddItem<TKey, TValue>(
-            this ObservableGroupedCollection<TKey, TValue> source,
-            TKey key,
-            TValue item)
-            where TKey : notnull
-        {
-            var group = source.FirstOrDefault(key);
-
-            if (group is null)
-            {
-                group = new ObservableGroup<TKey, TValue>(key);
-                source.Add(group);
-            }
-
-            group.Add(item);
-
-            return group;
-        }
-
-        /// <summary>
-        /// Insert <paramref name="item"/> into the first group with <paramref name="key"/> key at <paramref name="index"/>.
-        /// </summary>
-        /// <typeparam name="TKey">The type of the group key.</typeparam>
-        /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-        /// <param name="source">The source <see cref="ObservableGroupedCollection{TKey, TValue}"/> instance.</param>
-        /// <param name="key">The key of the group where to insert <paramref name="item"/>.</param>
-        /// <param name="index">The index where to insert <paramref name="item"/>.</param>
-        /// <param name="item">The item to add.</param>
-        /// <returns>The instance of the <see cref="ObservableGroup{TKey, TValue}"/> which will receive the value.</returns>
-        /// <exception cref="InvalidOperationException">The target group does not exist.</exception>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is less than zero or <paramref name="index"/> is greater than the group elements' count.</exception>
-        public static ObservableGroup<TKey, TValue> InsertItem<TKey, TValue>(
-            this ObservableGroupedCollection<TKey, TValue> source,
-            TKey key,
-            int index,
-            TValue item)
-            where TKey : notnull
-        {
-            var existingGroup = source.First(key);
-            existingGroup.Insert(index, item);
-
-            return existingGroup;
-        }
-
-        /// <summary>
-        /// Replace the element at <paramref name="index"/> with <paramref name="item"/> in the first group with <paramref name="key"/> key.
-        /// </summary>
-        /// <typeparam name="TKey">The type of the group key.</typeparam>
-        /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-        /// <param name="source">The source <see cref="ObservableGroupedCollection{TKey, TValue}"/> instance.</param>
-        /// <param name="key">The key of the group where to replace the item.</param>
-        /// <param name="index">The index where to insert <paramref name="item"/>.</param>
-        /// <param name="item">The item to add.</param>
-        /// <returns>The instance of the <see cref="ObservableGroup{TKey, TValue}"/> which will receive the value.</returns>
-        /// <exception cref="InvalidOperationException">The target group does not exist.</exception>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is less than zero or <paramref name="index"/> is greater than the group elements' count.</exception>
-        public static ObservableGroup<TKey, TValue> SetItem<TKey, TValue>(
-            this ObservableGroupedCollection<TKey, TValue> source,
-            TKey key,
-            int index,
-            TValue item)
-            where TKey : notnull
-        {
-            var existingGroup = source.First(key);
-            existingGroup[index] = item;
-
-            return existingGroup;
-        }
-
-        /// <summary>
-        /// Remove the first occurrence of the group with <paramref name="key"/> from the <paramref name="source"/> grouped collection.
-        /// It will not do anything if the group does not exist.
-        /// </summary>
-        /// <typeparam name="TKey">The type of the group key.</typeparam>
-        /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-        /// <param name="source">The source <see cref="ObservableGroupedCollection{TKey, TValue}"/> instance.</param>
-        /// <param name="key">The key of the group to remove.</param>
-        public static void RemoveGroup<TKey, TValue>(
-            this ObservableGroupedCollection<TKey, TValue> source,
-            TKey key)
-            where TKey : notnull
-        {
-            if (source.TryGetList(out var list))
-            {
-                var index = 0;
-                foreach (var group in list)
-                {
-                    if (EqualityComparer<TKey>.Default.Equals(group.Key, key))
-                    {
-                        source.RemoveAt(index);
-
-                        return;
-                    }
-
-                    index++;
-                }
-            }
-            else
-            {
-                // Fallback method
-                [MethodImpl(MethodImplOptions.NoInlining)]
-                static void RemoveGroupWithLinq(ObservableGroupedCollection<TKey, TValue> source, TKey key)
-                {
-                    var index = 0;
-                    foreach (var group in source)
-                    {
-                        if (EqualityComparer<TKey>.Default.Equals(group.Key, key))
-                        {
-                            source.RemoveAt(index);
-                            return;
-                        }
-
-                        index++;
-                    }
-                }
-
-                RemoveGroupWithLinq(source, key);
-            }
-        }
-
-        /// <summary>
-        /// Remove the first <paramref name="item"/> from the first group with <paramref name="key"/> from the <paramref name="source"/> grouped collection.
-        /// It will not do anything if the group or the item does not exist.
-        /// </summary>
-        /// <typeparam name="TKey">The type of the group key.</typeparam>
-        /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-        /// <param name="source">The source <see cref="ObservableGroupedCollection{TKey, TValue}"/> instance.</param>
-        /// <param name="key">The key of the group where the <paramref name="item"/> should be removed.</param>
-        /// <param name="item">The item to remove.</param>
-        /// <param name="removeGroupIfEmpty">If true (default value), the group will be removed once it becomes empty.</param>
-        public static void RemoveItem<TKey, TValue>(
-            this ObservableGroupedCollection<TKey, TValue> source,
-            TKey key,
-            TValue item,
-            bool removeGroupIfEmpty = true)
-            where TKey : notnull
-        {
-            if (source.TryGetList(out var list))
-            {
-                var index = 0;
-                foreach (var group in list)
-                {
-                    if (EqualityComparer<TKey>.Default.Equals(group.Key, key))
-                    {
-                        if (group.Remove(item) &&
-                            removeGroupIfEmpty &&
-                            group.Count == 0)
-                        {
-                            source.RemoveAt(index);
-                        }
-
-                        return;
-                    }
-
-                    index++;
-                }
-            }
-            else
-            {
-                // Fallback method
-                [MethodImpl(MethodImplOptions.NoInlining)]
-                static void RemoveItemWithLinq(
-                    ObservableGroupedCollection<TKey, TValue> source,
-                    TKey key,
-                    TValue item,
-                    bool removeGroupIfEmpty)
-                {
-                    var index = 0;
-                    foreach (var group in source)
-                    {
-                        if (EqualityComparer<TKey>.Default.Equals(group.Key, key))
-                        {
-                            if (group.Remove(item) &&
-                                removeGroupIfEmpty &&
-                                group.Count == 0)
-                            {
-                                source.RemoveAt(index);
-                            }
-
-                            return;
-                        }
-
-                        index++;
-                    }
-                }
-
-                RemoveItemWithLinq(source, key, item, removeGroupIfEmpty);
-            }
-        }
-
-        /// <summary>
-        /// Remove the item at <paramref name="index"/> from the first group with <paramref name="key"/> from the <paramref name="source"/> grouped collection.
-        /// It will not do anything if the group or the item does not exist.
-        /// </summary>
-        /// <typeparam name="TKey">The type of the group key.</typeparam>
-        /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-        /// <param name="source">The source <see cref="ObservableGroupedCollection{TKey, TValue}"/> instance.</param>
-        /// <param name="key">The key of the group where the item at <paramref name="index"/> should be removed.</param>
-        /// <param name="index">The index of the item to remove in the group.</param>
-        /// <param name="removeGroupIfEmpty">If true (default value), the group will be removed once it becomes empty.</param>
-        /// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is less than zero or <paramref name="index"/> is greater than the group elements' count.</exception>
-        public static void RemoveItemAt<TKey, TValue>(
-            this ObservableGroupedCollection<TKey, TValue> source,
-            TKey key,
-            int index,
-            bool removeGroupIfEmpty = true)
-            where TKey : notnull
-        {
-            if (source.TryGetList(out var list))
-            {
-                var groupIndex = 0;
-                foreach (var group in list)
-                {
-                    if (EqualityComparer<TKey>.Default.Equals(group.Key, key))
-                    {
-                        group.RemoveAt(index);
-
-                        if (removeGroupIfEmpty && group.Count == 0)
-                        {
-                            source.RemoveAt(groupIndex);
-                        }
-
-                        return;
-                    }
-
-                    groupIndex++;
-                }
-            }
-            else
-            {
-                // Fallback method
-                [MethodImpl(MethodImplOptions.NoInlining)]
-                static void RemoveItemAtWithLinq(
-                    ObservableGroupedCollection<TKey, TValue> source,
-                    TKey key,
-                    int index,
-                    bool removeGroupIfEmpty)
-                {
-                    var groupIndex = 0;
-                    foreach (var group in source)
-                    {
-                        if (EqualityComparer<TKey>.Default.Equals(group.Key, key))
-                        {
-                            group.RemoveAt(index);
-
-                            if (removeGroupIfEmpty && group.Count == 0)
-                            {
-                                source.RemoveAt(groupIndex);
-                            }
-
-                            return;
-                        }
-
-                        groupIndex++;
-                    }
-                }
-
-                RemoveItemAtWithLinq(source, key, index, removeGroupIfEmpty);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Collections/ReadOnlyObservableGroup.cs b/Microsoft.Toolkit/Collections/ReadOnlyObservableGroup.cs
deleted file mode 100644
index edc85bbb603..00000000000
--- a/Microsoft.Toolkit/Collections/ReadOnlyObservableGroup.cs
+++ /dev/null
@@ -1,57 +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;
-
-namespace Microsoft.Toolkit.Collections
-{
-    /// <summary>
-    /// A read-only observable group. It associates a <see cref="Key"/> to a <see cref="ReadOnlyObservableCollection{T}"/>.
-    /// </summary>
-    /// <typeparam name="TKey">The type of the group key.</typeparam>
-    /// <typeparam name="TValue">The type of the items in the collection.</typeparam>
-    public sealed class ReadOnlyObservableGroup<TKey, TValue> : ReadOnlyObservableCollection<TValue>, IGrouping<TKey, TValue>, IReadOnlyObservableGroup
-        where TKey : notnull
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyObservableGroup{TKey, TValue}"/> class.
-        /// </summary>
-        /// <param name="key">The key of the group.</param>
-        /// <param name="collection">The collection of items to add in the group.</param>
-        public ReadOnlyObservableGroup(TKey key, ObservableCollection<TValue> collection)
-            : base(collection)
-        {
-            Key = key;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyObservableGroup{TKey, TValue}"/> class.
-        /// </summary>
-        /// <param name="group">The <see cref="ObservableGroup{TKey, TValue}"/> to wrap.</param>
-        public ReadOnlyObservableGroup(ObservableGroup<TKey, TValue> group)
-            : base(group)
-        {
-            Key = group.Key;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyObservableGroup{TKey, TValue}"/> class.
-        /// </summary>
-        /// <param name="key">The key of the group.</param>
-        /// <param name="collection">The collection of items to add in the group.</param>
-        public ReadOnlyObservableGroup(TKey key, IEnumerable<TValue> collection)
-            : base(new ObservableCollection<TValue>(collection))
-        {
-            Key = key;
-        }
-
-        /// <inheritdoc/>
-        public TKey Key { get; }
-
-        /// <inheritdoc/>
-        object IReadOnlyObservableGroup.Key => Key;
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Collections/ReadOnlyObservableGroupedCollection.cs b/Microsoft.Toolkit/Collections/ReadOnlyObservableGroupedCollection.cs
deleted file mode 100644
index 5428fa39a45..00000000000
--- a/Microsoft.Toolkit/Collections/ReadOnlyObservableGroupedCollection.cs
+++ /dev/null
@@ -1,104 +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.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Linq;
-
-namespace Microsoft.Toolkit.Collections
-{
-    /// <summary>
-    /// A read-only list of groups.
-    /// </summary>
-    /// <typeparam name="TKey">The type of the group key.</typeparam>
-    /// <typeparam name = "TValue" > The type of the items in the collection.</typeparam>
-    public sealed class ReadOnlyObservableGroupedCollection<TKey, TValue> : ReadOnlyObservableCollection<ReadOnlyObservableGroup<TKey, TValue>>
-        where TKey : notnull
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyObservableGroupedCollection{TKey, TValue}"/> class.
-        /// </summary>
-        /// <param name="collection">The source collection to wrap.</param>
-        public ReadOnlyObservableGroupedCollection(ObservableGroupedCollection<TKey, TValue> collection)
-            : this(collection.Select(static g => new ReadOnlyObservableGroup<TKey, TValue>(g)))
-        {
-            ((INotifyCollectionChanged)collection).CollectionChanged += OnSourceCollectionChanged;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyObservableGroupedCollection{TKey, TValue}"/> class.
-        /// </summary>
-        /// <param name="collection">The initial data to add in the grouped collection.</param>
-        public ReadOnlyObservableGroupedCollection(IEnumerable<ReadOnlyObservableGroup<TKey, TValue>> collection)
-            : base(new ObservableCollection<ReadOnlyObservableGroup<TKey, TValue>>(collection))
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReadOnlyObservableGroupedCollection{TKey, TValue}"/> class.
-        /// </summary>
-        /// <param name="collection">The initial data to add in the grouped collection.</param>
-        public ReadOnlyObservableGroupedCollection(IEnumerable<IGrouping<TKey, TValue>> collection)
-            : this(collection.Select(static g => new ReadOnlyObservableGroup<TKey, TValue>(g.Key, g)))
-        {
-        }
-
-        private void OnSourceCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-        {
-            // Even if NotifyCollectionChangedEventArgs allows multiple items, the actual implementation
-            // is only reporting the changes one by one. We consider only this case for now.
-            if (e.OldItems?.Count > 1 || e.NewItems?.Count > 1)
-            {
-                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://aka.ms/windowstoolkit to report this.");
-                }
-
-                ThrowNotSupportedException();
-            }
-
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add or NotifyCollectionChangedAction.Replace:
-
-                    // We only need to find the new item if the operation is either add or remove. In this
-                    // case we just directly find the first item that was modified, or throw if it's not present.
-                    // This normally never happens anyway - add and replace should always have a target element.
-                    ObservableGroup<TKey, TValue> newItem = e.NewItems!.Cast<ObservableGroup<TKey, TValue>>().First();
-
-                    if (e.Action == NotifyCollectionChangedAction.Add)
-                    {
-                        Items.Insert(e.NewStartingIndex, new ReadOnlyObservableGroup<TKey, TValue>(newItem));
-                    }
-                    else
-                    {
-                        Items[e.OldStartingIndex] = new ReadOnlyObservableGroup<TKey, TValue>(newItem);
-                    }
-
-                    break;
-                case NotifyCollectionChangedAction.Move:
-
-                    // Our inner Items list is our own ObservableCollection<ReadOnlyObservableGroup<TKey, TValue>> so we can safely cast Items to its concrete type here.
-                    ((ObservableCollection<ReadOnlyObservableGroup<TKey, TValue>>)Items).Move(e.OldStartingIndex, e.NewStartingIndex);
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    Items.RemoveAt(e.OldStartingIndex);
-                    break;
-                case NotifyCollectionChangedAction.Reset:
-                    Items.Clear();
-                    break;
-                default:
-                    Debug.Fail("unsupported value");
-                    break;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Converters.cs b/Microsoft.Toolkit/Converters.cs
deleted file mode 100644
index 19026125509..00000000000
--- a/Microsoft.Toolkit/Converters.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace Microsoft.Toolkit
-{
-    /// <summary>
-    /// Set of helpers to convert between data types and notations.
-    /// </summary>
-    public static class Converters
-    {
-        /// <summary>
-        /// Translate numeric file size in bytes to a human-readable shorter string format.
-        /// </summary>
-        /// <param name="size">File size in bytes.</param>
-        /// <returns>Returns file size short string.</returns>
-        public static string ToFileSizeString(long size)
-        {
-            if (size < 1024)
-            {
-                return size.ToString("F0") + " bytes";
-            }
-            else if ((size >> 10) < 1024)
-            {
-                return (size / 1024F).ToString("F1") + " KB";
-            }
-            else if ((size >> 20) < 1024)
-            {
-                return ((size >> 10) / 1024F).ToString("F1") + " MB";
-            }
-            else if ((size >> 30) < 1024)
-            {
-                return ((size >> 20) / 1024F).ToString("F1") + " GB";
-            }
-            else if ((size >> 40) < 1024)
-            {
-                return ((size >> 30) / 1024F).ToString("F1") + " TB";
-            }
-            else if ((size >> 50) < 1024)
-            {
-                return ((size >> 40) / 1024F).ToString("F1") + " PB";
-            }
-            else
-            {
-                return ((size >> 50) / 1024F).ToString("F0") + " EB";
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Deferred/DeferredCancelEventArgs.cs b/Microsoft.Toolkit/Deferred/DeferredCancelEventArgs.cs
deleted file mode 100644
index a5941df2ade..00000000000
--- a/Microsoft.Toolkit/Deferred/DeferredCancelEventArgs.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.Deferred
-{
-    /// <summary>
-    /// <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 canceled.
-        /// </summary>
-        public bool Cancel { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Deferred/DeferredEventArgs.cs b/Microsoft.Toolkit/Deferred/DeferredEventArgs.cs
deleted file mode 100644
index ac705275ce8..00000000000
--- a/Microsoft.Toolkit/Deferred/DeferredEventArgs.cs
+++ /dev/null
@@ -1,60 +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;
-
-#pragma warning disable CA1001
-
-namespace Microsoft.Toolkit.Deferred
-{
-    /// <summary>
-    /// <see cref="EventArgs"/> which can retrieve a <see cref="EventDeferral"/> in order to process data asynchronously before an <see cref="EventHandler"/> completes and returns to the calling control.
-    /// </summary>
-    public class DeferredEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Gets a new <see cref="DeferredEventArgs"/> to use in cases where no <see cref="EventArgs"/> wish to be provided.
-        /// </summary>
-        public static new DeferredEventArgs Empty => new DeferredEventArgs();
-
-        private readonly object _eventDeferralLock = new object();
-
-        private EventDeferral? _eventDeferral;
-
-        /// <summary>
-        /// Returns an <see cref="EventDeferral"/> which can be completed when deferred event is ready to continue.
-        /// </summary>
-        /// <returns><see cref="EventDeferral"/> instance.</returns>
-        public EventDeferral GetDeferral()
-        {
-            lock (_eventDeferralLock)
-            {
-                return _eventDeferral ??= new EventDeferral();
-            }
-        }
-
-        /// <summary>
-        /// DO NOT USE - This is a support method used by <see cref="EventHandlerExtensions"/>. It is public only for
-        /// additional usage within extensions for the UWP based TypedEventHandler extensions.
-        /// </summary>
-        /// <returns>Internal EventDeferral reference</returns>
-#if !NETSTANDARD1_4
-        [Browsable(false)]
-#endif
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("This is an internal only method to be used by EventHandler extension classes, public callers should call GetDeferral() instead.")]
-        public EventDeferral? GetCurrentDeferralAndReset()
-        {
-            lock (_eventDeferralLock)
-            {
-                var eventDeferral = _eventDeferral;
-
-                _eventDeferral = null;
-
-                return eventDeferral;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Deferred/EventDeferral.cs b/Microsoft.Toolkit/Deferred/EventDeferral.cs
deleted file mode 100644
index dde5e7f624b..00000000000
--- a/Microsoft.Toolkit/Deferred/EventDeferral.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.ComponentModel;
-using System.Threading;
-using System.Threading.Tasks;
-
-#pragma warning disable CA1063
-
-namespace Microsoft.Toolkit.Deferred
-{
-    /// <summary>
-    /// Deferral handle provided by a <see cref="DeferredEventArgs"/>.
-    /// </summary>
-    public class EventDeferral : IDisposable
-    {
-        //// TODO: If/when .NET 5 is base, we can upgrade to non-generic version
-        private readonly TaskCompletionSource<object?> _taskCompletionSource = new TaskCompletionSource<object?>();
-
-        internal EventDeferral()
-        {
-        }
-
-        /// <summary>
-        /// Call when finished with the Deferral.
-        /// </summary>
-        public void Complete() => _taskCompletionSource.TrySetResult(null);
-
-        /// <summary>
-        /// Waits for the <see cref="EventDeferral"/> to be completed by the event handler.
-        /// </summary>
-        /// <param name="cancellationToken"><see cref="CancellationToken"/>.</param>
-        /// <returns><see cref="Task"/>.</returns>
-#if !NETSTANDARD1_4
-        [Browsable(false)]
-#endif
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("This is an internal only method to be used by EventHandler extension classes, public callers should call GetDeferral() instead on the DeferredEventArgs.")]
-        public async Task WaitForCompletion(CancellationToken cancellationToken)
-        {
-            using (cancellationToken.Register(() => _taskCompletionSource.TrySetCanceled()))
-            {
-                await _taskCompletionSource.Task;
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            Complete();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Extensions/ArrayExtensions.cs b/Microsoft.Toolkit/Extensions/ArrayExtensions.cs
deleted file mode 100644
index 2f375e34ad3..00000000000
--- a/Microsoft.Toolkit/Extensions/ArrayExtensions.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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Microsoft.Toolkit
-{
-    /// <summary>
-    /// Helpers for working with arrays.
-    /// </summary>
-    public static class ArrayExtensions
-    {
-        /// <summary>
-        /// Yields a column from a jagged array.
-        /// An exception will be thrown if the column is out of bounds, and return default in places where there are no elements from inner arrays.
-        /// Note: There is no equivalent GetRow method, as you can use array[row] to retrieve.
-        /// </summary>
-        /// <typeparam name="T">The element type of the array.</typeparam>
-        /// <param name="rectarray">The source array.</param>
-        /// <param name="column">Column record to retrieve, 0-based index.</param>
-        /// <returns>Yielded enumerable of column elements for given column, and default values for smaller inner arrays.</returns>
-        public static IEnumerable<T?> GetColumn<T>(this T?[][] rectarray, int column)
-        {
-            if (column < 0 || column >= rectarray.Max(array => array.Length))
-            {
-                throw new ArgumentOutOfRangeException(nameof(column));
-            }
-
-            for (int r = 0; r < rectarray.GetLength(0); r++)
-            {
-                if (column >= rectarray[r].Length)
-                {
-                    yield return default;
-
-                    continue;
-                }
-
-                yield return rectarray[r][column];
-            }
-        }
-
-        /// <summary>
-        /// Returns a simple string representation of an array.
-        /// </summary>
-        /// <typeparam name="T">The element type of the array.</typeparam>
-        /// <param name="array">The source array.</param>
-        /// <returns>The <see cref="string"/> representation of the array.</returns>
-        public static string ToArrayString<T>(this T?[] array)
-        {
-            // The returned string will be in the following format:
-            // [1, 2, 3]
-            StringBuilder builder = new StringBuilder();
-
-            builder.Append('[');
-
-            for (int i = 0; i < array.Length; i++)
-            {
-                if (i != 0)
-                {
-                    builder.Append(",\t");
-                }
-
-                builder.Append(array[i]?.ToString());
-            }
-
-            builder.Append(']');
-
-            return builder.ToString();
-        }
-
-        /// <summary>
-        /// Returns a simple string representation of a jagged array.
-        /// </summary>
-        /// <typeparam name="T">The element type of the array.</typeparam>
-        /// <param name="mdarray">The source array.</param>
-        /// <returns>String representation of the array.</returns>
-        public static string ToArrayString<T>(this T?[][] mdarray)
-        {
-            // The returned string uses the same format as the overload for 2D arrays
-            StringBuilder builder = new StringBuilder();
-
-            builder.Append('[');
-
-            for (int i = 0; i < mdarray.Length; i++)
-            {
-                if (i != 0)
-                {
-                    builder.Append(',');
-                    builder.Append(Environment.NewLine);
-                    builder.Append(' ');
-                }
-
-                builder.Append('[');
-
-                T?[] row = mdarray[i];
-
-                for (int j = 0; j < row.Length; j++)
-                {
-                    if (j != 0)
-                    {
-                        builder.Append(",\t");
-                    }
-
-                    builder.Append(row[j]?.ToString());
-                }
-
-                builder.Append(']');
-            }
-
-            builder.Append(']');
-
-            return builder.ToString();
-        }
-
-        /// <summary>
-        /// Returns a simple string representation of a 2D array.
-        /// </summary>
-        /// <typeparam name="T">The element type of the array.</typeparam>
-        /// <param name="array">The source array.</param>
-        /// <returns>The <see cref="string"/> representation of the array.</returns>
-        public static string ToArrayString<T>(this T?[,] array)
-        {
-            // The returned string will be in the following format:
-            // [[1, 2,  3],
-            //  [4, 5,  6],
-            //  [7, 8,  9]]
-            StringBuilder builder = new StringBuilder();
-
-            builder.Append('[');
-
-            int
-                height = array.GetLength(0),
-                width = array.GetLength(1);
-
-            for (int i = 0; i < height; i++)
-            {
-                if (i != 0)
-                {
-                    builder.Append(',');
-                    builder.Append(Environment.NewLine);
-                    builder.Append(' ');
-                }
-
-                builder.Append('[');
-
-                for (int j = 0; j < width; j++)
-                {
-                    if (j != 0)
-                    {
-                        builder.Append(",\t");
-                    }
-
-                    builder.Append(array[i, j]?.ToString());
-                }
-
-                builder.Append(']');
-            }
-
-            builder.Append(']');
-
-            return builder.ToString();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Extensions/EventHandlerExtensions.cs b/Microsoft.Toolkit/Extensions/EventHandlerExtensions.cs
deleted file mode 100644
index 0467a7c1eaa..00000000000
--- a/Microsoft.Toolkit/Extensions/EventHandlerExtensions.cs
+++ /dev/null
@@ -1,67 +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 System.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.Deferred
-{
-    /// <summary>
-    /// Extensions to <see cref="EventHandler{TEventArgs}"/> for Deferred Events.
-    /// </summary>
-    public static class EventHandlerExtensions
-    {
-        /// <summary>
-        /// Use to invoke an async <see cref="EventHandler{TEventArgs}"/> using <see cref="DeferredEventArgs"/>.
-        /// </summary>
-        /// <typeparam name="T"><see cref="EventArgs"/> type.</typeparam>
-        /// <param name="eventHandler"><see cref="EventHandler{TEventArgs}"/> to be invoked.</param>
-        /// <param name="sender">Sender of the event.</param>
-        /// <param name="eventArgs"><see cref="EventArgs"/> instance.</param>
-        /// <returns><see cref="Task"/> to wait on deferred event handler.</returns>
-        public static Task InvokeAsync<T>(this EventHandler<T> eventHandler, object sender, T eventArgs)
-            where T : DeferredEventArgs
-        {
-            return InvokeAsync(eventHandler, sender, eventArgs, CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Use to invoke an async <see cref="EventHandler{TEventArgs}"/> using <see cref="DeferredEventArgs"/> with a <see cref="CancellationToken"/>.
-        /// </summary>
-        /// <typeparam name="T"><see cref="EventArgs"/> type.</typeparam>
-        /// <param name="eventHandler"><see cref="EventHandler{TEventArgs}"/> to be invoked.</param>
-        /// <param name="sender">Sender of the event.</param>
-        /// <param name="eventArgs"><see cref="EventArgs"/> instance.</param>
-        /// <param name="cancellationToken"><see cref="CancellationToken"/> option.</param>
-        /// <returns><see cref="Task"/> to wait on deferred event handler.</returns>
-        public static Task InvokeAsync<T>(this EventHandler<T> eventHandler, object sender, T eventArgs, CancellationToken cancellationToken)
-            where T : DeferredEventArgs
-        {
-            if (eventHandler == null)
-            {
-                return Task.CompletedTask;
-            }
-
-            var tasks = eventHandler.GetInvocationList()
-                .OfType<EventHandler<T>>()
-                .Select(invocationDelegate =>
-                {
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    invocationDelegate(sender, eventArgs);
-
-#pragma warning disable CS0618 // Type or member is obsolete
-                    var deferral = eventArgs.GetCurrentDeferralAndReset();
-
-                    return deferral?.WaitForCompletion(cancellationToken) ?? Task.CompletedTask;
-#pragma warning restore CS0618 // Type or member is obsolete
-                })
-                .ToArray();
-
-            return Task.WhenAll(tasks);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Extensions/ISettingsStorageHelperExtensions.cs b/Microsoft.Toolkit/Extensions/ISettingsStorageHelperExtensions.cs
deleted file mode 100644
index 765408d92ff..00000000000
--- a/Microsoft.Toolkit/Extensions/ISettingsStorageHelperExtensions.cs
+++ /dev/null
@@ -1,84 +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.Text;
-using Microsoft.Toolkit.Helpers;
-
-namespace Microsoft.Toolkit.Extensions
-{
-    /// <summary>
-    /// Helpers methods for working with <see cref="ISettingsStorageHelper{TKey}"/> implementations.
-    /// </summary>
-    public static class ISettingsStorageHelperExtensions
-    {
-        /// <summary>
-        /// Attempts to read the provided key and return the value.
-        /// If the key is not found, the fallback value will be used instead.
-        /// </summary>
-        /// <typeparam name="TKey">The type of key used to lookup the object.</typeparam>
-        /// <typeparam name="TValue">The type of object value expected.</typeparam>
-        /// <param name="storageHelper">The storage helper instance fo read from.</param>
-        /// <param name="key">The key of the target object.</param>
-        /// <param name="fallback">An alternative value returned if the read fails.</param>
-        /// <returns>The value of the target object, or the fallback value.</returns>
-        public static TValue? GetValueOrDefault<TKey, TValue>(this ISettingsStorageHelper<TKey> storageHelper, TKey key, TValue? fallback = default)
-            where TKey : notnull
-        {
-            if (storageHelper.TryRead<TValue>(key, out TValue? storedValue))
-            {
-                return storedValue;
-            }
-            else
-            {
-                return fallback;
-            }
-        }
-
-        /// <summary>
-        /// Read the key in the storage helper instance and get the value.
-        /// </summary>
-        /// <typeparam name="TKey">The type of key used to lookup the object.</typeparam>
-        /// <typeparam name="TValue">The type of object value expected.</typeparam>
-        /// <param name="storageHelper">The storage helper instance fo read from.</param>
-        /// <param name="key">The key of the target object.</param>
-        /// <returns>The value of the target object</returns>
-        /// <exception cref="KeyNotFoundException">Throws when the key is not found in storage.</exception>
-        public static TValue? Read<TKey, TValue>(this ISettingsStorageHelper<TKey> storageHelper, TKey key)
-            where TKey : notnull
-        {
-            if (storageHelper.TryRead<TValue>(key, out TValue? value))
-            {
-                return value;
-            }
-            else
-            {
-                ThrowKeyNotFoundException(key);
-                return default;
-            }
-        }
-
-        /// <summary>
-        /// Deletes a key from storage.
-        /// </summary>
-        /// <typeparam name="TKey">The type of key used to lookup the object.</typeparam>
-        /// <param name="storageHelper">The storage helper instance to delete from.</param>
-        /// <param name="key">The key of the target object.</param>
-        /// <exception cref="KeyNotFoundException">Throws when the key is not found in storage.</exception>
-        public static void Delete<TKey>(this ISettingsStorageHelper<TKey> storageHelper, TKey key)
-            where TKey : notnull
-        {
-            if (!storageHelper.TryDelete(key))
-            {
-                ThrowKeyNotFoundException(key);
-            }
-        }
-
-        private static void ThrowKeyNotFoundException<TKey>(TKey key)
-        {
-            throw new KeyNotFoundException($"The given key '{key}' was not present");
-        }
-    }
-}
diff --git a/Microsoft.Toolkit/Extensions/StringExtensions.cs b/Microsoft.Toolkit/Extensions/StringExtensions.cs
deleted file mode 100644
index 817ba1a1c62..00000000000
--- a/Microsoft.Toolkit/Extensions/StringExtensions.cs
+++ /dev/null
@@ -1,188 +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.CodeAnalysis;
-using System.Globalization;
-using System.Net;
-using System.Text.RegularExpressions;
-
-namespace Microsoft.Toolkit
-{
-    /// <summary>
-    /// Helpers for working with strings and string representations.
-    /// </summary>
-    public static class StringExtensions
-    {
-        /// <summary>
-        /// Regular expression for matching a phone number.
-        /// </summary>
-        internal const string PhoneNumberRegex = @"^[+]?(\d{1,3})?[\s.-]?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}$";
-
-        /// <summary>
-        /// Regular expression for matching a string that contains only letters.
-        /// </summary>
-        internal const string CharactersRegex = "^[A-Za-z]+$";
-
-        /// <summary>
-        /// Regular expression for matching an email address.
-        /// </summary>
-        /// <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>
-        /// Regular expression of HTML tags to remove.
-        /// </summary>
-        private const string RemoveHtmlTagsRegex = @"(?></?\w+)(?>(?:[^>'""]+|'[^']*'|""[^""]*"")*)>";
-
-        /// <summary>
-        /// Regular expression for removing comments from HTML.
-        /// </summary>
-        private static readonly Regex RemoveHtmlCommentsRegex = new("<!--.*?-->", RegexOptions.Singleline);
-
-        /// <summary>
-        /// Regular expression for removing scripts from HTML.
-        /// </summary>
-        private static readonly Regex RemoveHtmlScriptsRegex = new(@"(?s)<script.*?(/>|</script>)", RegexOptions.Singleline | RegexOptions.IgnoreCase);
-
-        /// <summary>
-        /// Regular expression for removing styles from HTML.
-        /// </summary>
-        private static readonly Regex RemoveHtmlStylesRegex = new(@"(?s)<style.*?(/>|</style>)", RegexOptions.Singleline | RegexOptions.IgnoreCase);
-
-        /// <summary>
-        /// Determines whether a string is a valid email address.
-        /// </summary>
-        /// <param name="str">The string to test.</param>
-        /// <returns><c>true</c> for a valid email address; otherwise, <c>false</c>.</returns>
-        public static bool IsEmail(this string str) => Regex.IsMatch(str, EmailRegex);
-
-        /// <summary>
-        /// Determines whether a string is a valid decimal number.
-        /// </summary>
-        /// <param name="str">The string to test.</param>
-        /// <returns><c>true</c> for a valid decimal number; otherwise, <c>false</c>.</returns>
-        public static bool IsDecimal([NotNullWhen(true)] this string? str)
-        {
-            return decimal.TryParse(str, NumberStyles.Number, CultureInfo.InvariantCulture, out _);
-        }
-
-        /// <summary>
-        /// Determines whether a string is a valid integer.
-        /// </summary>
-        /// <param name="str">The string to test.</param>
-        /// <returns><c>true</c> for a valid integer; otherwise, <c>false</c>.</returns>
-        public static bool IsNumeric([NotNullWhen(true)] this string? str)
-        {
-            return int.TryParse(str, out _);
-        }
-
-        /// <summary>
-        /// Determines whether a string is a valid phone number.
-        /// </summary>
-        /// <param name="str">The string to test.</param>
-        /// <returns><c>true</c> for a valid phone number; otherwise, <c>false</c>.</returns>
-        public static bool IsPhoneNumber(this string str) => Regex.IsMatch(str, PhoneNumberRegex);
-
-        /// <summary>
-        /// Determines whether a string contains only letters.
-        /// </summary>
-        /// <param name="str">The string to test.</param>
-        /// <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 with HTML comments, scripts, styles, and tags removed.
-        /// </summary>
-        /// <param name="htmlText">HTML string.</param>
-        /// <returns>Decoded HTML string.</returns>
-        [return: NotNullIfNotNull("htmlText")]
-        public static string? DecodeHtml(this string? htmlText)
-        {
-            if (htmlText is null)
-            {
-                return null;
-            }
-
-            var ret = htmlText.FixHtml();
-
-            // Remove html tags
-            ret = new Regex(RemoveHtmlTagsRegex).Replace(ret, string.Empty);
-
-            return WebUtility.HtmlDecode(ret);
-        }
-
-        /// <summary>
-        /// Returns a string with HTML comments, scripts, and styles removed.
-        /// </summary>
-        /// <param name="html">HTML string to fix.</param>
-        /// <returns>Fixed HTML string.</returns>
-        public static string FixHtml(this string html)
-        {
-            // Remove comments
-            var withoutComments = RemoveHtmlCommentsRegex.Replace(html, string.Empty);
-
-            // Remove scripts
-            var withoutScripts = RemoveHtmlScriptsRegex.Replace(withoutComments, string.Empty);
-
-            // Remove styles
-            var withoutStyles = RemoveHtmlStylesRegex.Replace(withoutScripts, string.Empty);
-
-            return withoutStyles;
-        }
-
-        /// <summary>
-        /// Truncates a string to the specified length.
-        /// </summary>
-        /// <param name="value">The string to be truncated.</param>
-        /// <param name="length">The maximum length.</param>
-        /// <returns>Truncated string.</returns>
-        public static string Truncate(this string? value, int length) => Truncate(value, length, false);
-
-        /// <summary>
-        /// Provide better linking for resourced strings.
-        /// </summary>
-        /// <param name="format">The format of the string being linked.</param>
-        /// <param name="args">The object which will receive the linked String.</param>
-        /// <returns>Truncated string.</returns>
-        [Obsolete("This method will be removed in a future version of the Toolkit. Use the native C# string interpolation syntax instead, see: https://docs.microsoft.com/dotnet/csharp/language-reference/tokens/interpolated")]
-        public static string AsFormat(this string format, params object[] args)
-        {
-            // Note: this extension was originally added to help developers using {x:Bind} in XAML, but
-            // due to a known limitation in the UWP/WinUI XAML compiler, using either this method or the
-            // standard string.Format method from the BCL directly doesn't always work. Since this method
-            // doesn't actually provide any benefit over the built-in one, it has been marked as obsolete.
-            // For more details, see the WinUI issue on the XAML compiler limitation here:
-            // https://github.com/microsoft/microsoft-ui-xaml/issues/2654.
-            return string.Format(format, args);
-        }
-
-        /// <summary>
-        /// Truncates a string to the specified length.
-        /// </summary>
-        /// <param name="value">The string to be truncated.</param>
-        /// <param name="length">The maximum length.</param>
-        /// <param name="ellipsis"><c>true</c> to add ellipsis to the truncated text; otherwise, <c>false</c>.</param>
-        /// <returns>Truncated string.</returns>
-        public static string Truncate(this string? value, int length, bool ellipsis)
-        {
-            if (!string.IsNullOrEmpty(value))
-            {
-                value = value!.Trim();
-
-                if (value.Length > length)
-                {
-                    if (ellipsis)
-                    {
-                        return value.Substring(0, length) + "...";
-                    }
-
-                    return value.Substring(0, length);
-                }
-            }
-
-            return value ?? string.Empty;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Extensions/TaskExtensions.cs b/Microsoft.Toolkit/Extensions/TaskExtensions.cs
deleted file mode 100644
index e0cfb87fd20..00000000000
--- a/Microsoft.Toolkit/Extensions/TaskExtensions.cs
+++ /dev/null
@@ -1,85 +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.Diagnostics.Contracts;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-
-namespace Microsoft.Toolkit
-{
-    /// <summary>
-    /// Helpers for working with tasks.
-    /// </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? GetResultOrDefault(this Task task)
-        {
-            // Check if the instance is a completed Task
-            if (
-#if NETSTANDARD2_1
-                task.IsCompletedSuccessfully
-#else
-                task.Status == TaskStatus.RanToCompletion
-#endif
-            )
-            {
-                // We need an explicit check to ensure the input task is not the cached
-                // Task.CompletedTask instance, because that can internally be stored as
-                // a Task<T> for some given T (eg. on .NET 5 it's VoidTaskResult), which
-                // would cause the following code to return that result instead of null.
-                if (task != Task.CompletedTask)
-                {
-                    // 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
-                        task.GetType().GetRuntimeProperty(nameof(Task<object>.Result));
-#else
-                        task.GetType().GetProperty(nameof(Task<object>.Result));
-#endif
-
-                    // Return the result, if possible
-                    return propertyInfo?.GetValue(task);
-                }
-            }
-
-            return null;
-        }
-
-        /// <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? GetResultOrDefault<T>(this Task<T?> task)
-        {
-#if NETSTANDARD2_1
-            return task.IsCompletedSuccessfully ? task.Result : default;
-#else
-            return task.Status == TaskStatus.RanToCompletion ? task.Result : default;
-#endif
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Helpers/ObjectStorage/DirectoryItemType.cs b/Microsoft.Toolkit/Helpers/ObjectStorage/DirectoryItemType.cs
deleted file mode 100644
index 150fa3770ac..00000000000
--- a/Microsoft.Toolkit/Helpers/ObjectStorage/DirectoryItemType.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.Helpers
-{
-    /// <summary>
-    /// Represents the types of items available in a directory.
-    /// </summary>
-    public enum DirectoryItemType
-    {
-        /// <summary>
-        /// The item is neither a file or a folder.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// Represents a file type item.
-        /// </summary>
-        File,
-
-        /// <summary>
-        /// Represents a folder type item.
-        /// </summary>
-        Folder
-    }
-}
diff --git a/Microsoft.Toolkit/Helpers/ObjectStorage/IFileStorageHelper.cs b/Microsoft.Toolkit/Helpers/ObjectStorage/IFileStorageHelper.cs
deleted file mode 100644
index 7e45d82d7c9..00000000000
--- a/Microsoft.Toolkit/Helpers/ObjectStorage/IFileStorageHelper.cs
+++ /dev/null
@@ -1,68 +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.Tasks;
-
-namespace Microsoft.Toolkit.Helpers
-{
-    /// <summary>
-    /// Service interface used to store data in a directory/file-system via files and folders.
-    ///
-    /// This interface is meant to help abstract file storage operations across platforms in a library,
-    /// but the actual behavior will be up to the implementer. Such as, we don't provide a sense of a current directory,
-    /// so an implementor should consider using full paths to support any file operations. Otherwise, a "directory aware"
-    /// implementation could be achieved with a current directory field and traversal functions, in which case relative paths would be applicable.
-    /// </summary>
-    public interface IFileStorageHelper
-    {
-        /// <summary>
-        /// Retrieves an object from a file.
-        /// </summary>
-        /// <typeparam name="T">Type of object retrieved.</typeparam>
-        /// <param name="filePath">Path to the file that contains the object.</param>
-        /// <param name="default">Default value of the object.</param>
-        /// <returns>Waiting task until completion with the object in the file.</returns>
-        Task<T?> ReadFileAsync<T>(string filePath, T? @default = default);
-
-        /// <summary>
-        /// Retrieves the listings for a folder and the item types.
-        /// </summary>
-        /// <param name="folderPath">The path to the target folder.</param>
-        /// <returns>A list of item types and names in the target folder.</returns>
-        Task<IEnumerable<(DirectoryItemType ItemType, string Name)>> ReadFolderAsync(string folderPath);
-
-        /// <summary>
-        /// Saves an object inside a file.
-        /// </summary>
-        /// <typeparam name="T">Type of object saved.</typeparam>
-        /// <param name="filePath">Path to the file that will contain the object.</param>
-        /// <param name="value">Object to save.</param>
-        /// <returns>Waiting task until completion.</returns>
-        Task CreateFileAsync<T>(string filePath, T value);
-
-        /// <summary>
-        /// Ensure a folder exists at the folder path specified.
-        /// </summary>
-        /// <param name="folderPath">The path and name of the target folder.</param>
-        /// <returns>Waiting task until completion.</returns>
-        Task CreateFolderAsync(string folderPath);
-
-        /// <summary>
-        /// Deletes a file or folder item.
-        /// </summary>
-        /// <param name="itemPath">The path to the item for deletion.</param>
-        /// <returns>Waiting task until completion.</returns>
-        Task<bool> TryDeleteItemAsync(string itemPath);
-
-        /// <summary>
-        /// Rename an item.
-        /// </summary>
-        /// <param name="itemPath">The path to the target item.</param>
-        /// <param name="newName">The new nam for the target item.</param>
-        /// <returns>Waiting task until completion.</returns>
-        Task<bool> TryRenameItemAsync(string itemPath, string newName);
-    }
-}
diff --git a/Microsoft.Toolkit/Helpers/ObjectStorage/IObjectSerializer.cs b/Microsoft.Toolkit/Helpers/ObjectStorage/IObjectSerializer.cs
deleted file mode 100644
index 5a8177b4f78..00000000000
--- a/Microsoft.Toolkit/Helpers/ObjectStorage/IObjectSerializer.cs
+++ /dev/null
@@ -1,28 +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.Helpers
-{
-    /// <summary>
-    /// A basic serialization service.
-    /// </summary>
-    public interface IObjectSerializer
-    {
-        /// <summary>
-        /// Serialize an object into a string. It is recommended to use strings as the final format for objects.
-        /// </summary>
-        /// <typeparam name="T">The type of the object to serialize.</typeparam>
-        /// <param name="value">The object to serialize.</param>
-        /// <returns>The serialized object.</returns>
-        string? Serialize<T>(T value);
-
-        /// <summary>
-        /// Deserialize string into an object of the given type.
-        /// </summary>
-        /// <typeparam name="T">The type of the deserialized object.</typeparam>
-        /// <param name="value">The string to deserialize.</param>
-        /// <returns>The deserialized object.</returns>
-        T Deserialize<T>(string value);
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Helpers/ObjectStorage/ISettingsStorageHelper.cs b/Microsoft.Toolkit/Helpers/ObjectStorage/ISettingsStorageHelper.cs
deleted file mode 100644
index c8f9713b5d8..00000000000
--- a/Microsoft.Toolkit/Helpers/ObjectStorage/ISettingsStorageHelper.cs
+++ /dev/null
@@ -1,45 +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;
-
-namespace Microsoft.Toolkit.Helpers
-{
-    /// <summary>
-    /// Service interface used to store data using key value pairs.
-    /// </summary>
-    /// <typeparam name="TKey">The type of keys to use for accessing values.</typeparam>
-    public interface ISettingsStorageHelper<in TKey>
-        where TKey : notnull
-    {
-        /// <summary>
-        /// Retrieves a single item by its key.
-        /// </summary>
-        /// <typeparam name="TValue">Type of object retrieved.</typeparam>
-        /// <param name="key">Key of the object.</param>
-        /// <param name="value">The <see typeparamref="TValue"/> object for <see typeparamref="TKey"/> key.</param>
-        /// <returns>A boolean indicator of success.</returns>
-        bool TryRead<TValue>(TKey key, out TValue? value);
-
-        /// <summary>
-        /// Saves a single item by its key.
-        /// </summary>
-        /// <typeparam name="TValue">Type of object saved.</typeparam>
-        /// <param name="key">Key of the value saved.</param>
-        /// <param name="value">Object to save.</param>
-        void Save<TValue>(TKey key, TValue value);
-
-        /// <summary>
-        /// Deletes a single item by its key.
-        /// </summary>
-        /// <param name="key">Key of the object.</param>
-        /// <returns>A boolean indicator of success.</returns>
-        bool TryDelete(TKey key);
-
-        /// <summary>
-        /// Clear all keys and values from the settings store.
-        /// </summary>
-        void Clear();
-    }
-}
diff --git a/Microsoft.Toolkit/Helpers/ObjectStorage/SystemSerializer.cs b/Microsoft.Toolkit/Helpers/ObjectStorage/SystemSerializer.cs
deleted file mode 100644
index 62d1b681c06..00000000000
--- a/Microsoft.Toolkit/Helpers/ObjectStorage/SystemSerializer.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;
-using System.Reflection;
-
-namespace Microsoft.Toolkit.Helpers
-{
-    /// <summary>
-    /// A bare-bones serializer which knows how to deal with primitive types and strings only.
-    /// It is recommended for more complex scenarios to implement your own <see cref="IObjectSerializer"/> based on System.Text.Json, Newtonsoft.Json, or DataContractJsonSerializer see https://aka.ms/wct/storagehelper-migration
-    /// </summary>
-    public class SystemSerializer : IObjectSerializer
-    {
-        /// <summary>
-        /// Take a primitive value from storage and return it as the requested type using the <see cref="Convert.ChangeType(object, Type)"/> API.
-        /// </summary>
-        /// <typeparam name="T">Type to convert value to.</typeparam>
-        /// <param name="value">Value from storage to convert.</param>
-        /// <returns>Deserialized value or default value.</returns>
-        public T Deserialize<T>(string value)
-        {
-            var type = typeof(T);
-            var typeInfo = type.GetTypeInfo();
-
-            if (typeInfo.IsPrimitive || type == typeof(string))
-            {
-                return (T)Convert.ChangeType(value, type);
-            }
-
-            throw new NotSupportedException("This serializer can only handle primitive types and strings. Please implement your own IObjectSerializer for more complex scenarios.");
-        }
-
-        /// <summary>
-        /// Returns the value so that it can be serialized directly.
-        /// </summary>
-        /// <typeparam name="T">Type to serialize from.</typeparam>
-        /// <param name="value">Value to serialize.</param>
-        /// <returns>String representation of value.</returns>
-        public string? Serialize<T>(T value)
-        {
-            return value?.ToString();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/IncrementalLoadingCollection/IIncrementalSource.cs b/Microsoft.Toolkit/IncrementalLoadingCollection/IIncrementalSource.cs
deleted file mode 100644
index 8e46e20c9ba..00000000000
--- a/Microsoft.Toolkit/IncrementalLoadingCollection/IIncrementalSource.cs
+++ /dev/null
@@ -1,34 +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.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.Toolkit.Collections
-{
-    /// <summary>
-    /// This interface represents a data source whose items can be loaded incrementally.
-    /// </summary>
-    /// <typeparam name="TSource">Type of collection element.</typeparam>
-    public interface IIncrementalSource<TSource>
-    {
-        /// <summary>
-        /// 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.
-        /// </param>
-        /// <param name="pageSize">
-        /// The number of <typeparamref name="TSource"/> items to retrieve for the specified <paramref name="pageIndex"/>.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Used to propagate notification that operation should be canceled.
-        /// </param>
-        /// <returns>
-        /// Returns a collection of <typeparamref name="TSource"/>.
-        /// </returns>
-        Task<IEnumerable<TSource>> GetPagedItemsAsync(int pageIndex, int pageSize, CancellationToken cancellationToken = default(CancellationToken));
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit/Microsoft.Toolkit.csproj b/Microsoft.Toolkit/Microsoft.Toolkit.csproj
deleted file mode 100644
index 6efb4c97210..00000000000
--- a/Microsoft.Toolkit/Microsoft.Toolkit.csproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Nullable>Enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>netstandard1.4;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <Title>Windows Community Toolkit - Common (.NET Standard)</Title>
-    <Description>
-      This package includes .NET Standard code only helpers such as:
-      - IncrementalLoadingCollection: Simplifies the definition and usage of collections whose items can be loaded incrementally only when needed by the view.
-      - String extensions and array extensions: These extensions make working with string and arrays easier.
-    </Description>
-    <PackageTags>Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;Extensions;Helpers</PackageTags>
-  </PropertyGroup>
-
-  <!-- .NET Standard 2.1 and .NET 5 already have [NotNullIfNotNull] and [NotNullWhen] -->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'net5.0'">
-    <DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
-  </PropertyGroup>
-
-  <!-- .NET Standard 1.4 doesn't have the [Pure] attribute or ValueTuple -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.4'">
-    <PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/SmokeTests/Microsoft.Toolkit.Diagnostics/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Diagnostics/MainPage.xaml
deleted file mode 100644
index 7f4b7ee447c..00000000000
--- a/SmokeTests/Microsoft.Toolkit.Diagnostics/MainPage.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Page
-    x:Class="SmokeTest.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SmokeTest"
-    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>
-        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="200">
-            <TextBox x:Name="textBox" Text="text"/>
-            <Button Content="Is not null or empty?" Click="Button_Click" HorizontalAlignment="Center"/>
-            <TextBlock x:Name="textBlock"/>
-        </StackPanel>
-    </Grid>
-</Page>
\ No newline at end of file
diff --git a/SmokeTests/Microsoft.Toolkit.Diagnostics/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Diagnostics/MainPage.xaml.cs
deleted file mode 100644
index d3c4de2292f..00000000000
--- a/SmokeTests/Microsoft.Toolkit.Diagnostics/MainPage.xaml.cs
+++ /dev/null
@@ -1,23 +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.Diagnostics;
-
-namespace SmokeTest
-{
-    public sealed partial class MainPage
-    {
-        public MainPage()
-        {
-            InitializeComponent();
-        }
-
-        private void Button_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
-        {
-            Guard.IsNotNullOrEmpty(textBox.Text, nameof(textBox));
-
-            textBlock.Text = "Ok";
-        }
-    }
-}
\ No newline at end of file
diff --git a/SmokeTests/Microsoft.Toolkit.HighPerformance/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.HighPerformance/MainPage.xaml
deleted file mode 100644
index 484543d9ddc..00000000000
--- a/SmokeTests/Microsoft.Toolkit.HighPerformance/MainPage.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Page
-    x:Class="SmokeTest.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SmokeTest"
-    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>
-        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="300">
-            <Button Content="Click" Click="Button_Click" HorizontalAlignment="Center"/>
-            <TextBlock x:Name="textBlock" HorizontalAlignment="Center"/>
-        </StackPanel>
-    </Grid>
-</Page>
\ No newline at end of file
diff --git a/SmokeTests/Microsoft.Toolkit.HighPerformance/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.HighPerformance/MainPage.xaml.cs
deleted file mode 100644
index 8dcd1a7bc1c..00000000000
--- a/SmokeTests/Microsoft.Toolkit.HighPerformance/MainPage.xaml.cs
+++ /dev/null
@@ -1,23 +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.HighPerformance.Helpers;
-
-namespace SmokeTest
-{
-    public sealed partial class MainPage
-    {
-        public MainPage()
-        {
-            InitializeComponent();
-        }
-
-        private void Button_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
-        {
-            const uint value = 0xAAAA5555u;
-
-            textBlock.Text = BitHelper.HasLookupFlag(value, 0).ToString();
-        }
-    }
-}
\ No newline at end of file
diff --git a/SmokeTests/Microsoft.Toolkit.Mvvm/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Mvvm/MainPage.xaml
deleted file mode 100644
index 8911f784a27..00000000000
--- a/SmokeTests/Microsoft.Toolkit.Mvvm/MainPage.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Page
-    x:Class="SmokeTest.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SmokeTest"
-    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>
-        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="200">
-            <Button Content="Click" Command="{x:Bind TestCommand}" HorizontalAlignment="Center"/>
-            <TextBlock x:Name="textBlock"/>
-        </StackPanel>
-    </Grid>
-</Page>
\ No newline at end of file
diff --git a/SmokeTests/Microsoft.Toolkit.Mvvm/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Mvvm/MainPage.xaml.cs
deleted file mode 100644
index d073b99a9ba..00000000000
--- a/SmokeTests/Microsoft.Toolkit.Mvvm/MainPage.xaml.cs
+++ /dev/null
@@ -1,25 +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.Mvvm.Input;
-
-namespace SmokeTest
-{
-    public sealed partial class MainPage
-    {
-        public RelayCommand TestCommand { get; }
-
-        public MainPage()
-        {
-            TestCommand = new RelayCommand(ExecuteRelayCommand);
-
-            InitializeComponent();
-        }
-
-        private void ExecuteRelayCommand()
-        {
-            textBlock.Text = "Clicked";
-        }
-    }
-}
\ No newline at end of file
diff --git a/SmokeTests/Microsoft.Toolkit/MainPage.xaml b/SmokeTests/Microsoft.Toolkit/MainPage.xaml
deleted file mode 100644
index 6978730fc13..00000000000
--- a/SmokeTests/Microsoft.Toolkit/MainPage.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<Page
-    x:Class="SmokeTest.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SmokeTest"
-    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>
-        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="200">
-            <TextBox x:Name="textBox"/>
-            <Button Content="Is Email?" Click="Button_Click" HorizontalAlignment="Center"/>
-            <TextBlock x:Name="textBlock"/>
-        </StackPanel>
-    </Grid>
-</Page>
\ No newline at end of file
diff --git a/SmokeTests/Microsoft.Toolkit/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit/MainPage.xaml.cs
deleted file mode 100644
index c4c9d5c5335..00000000000
--- a/SmokeTests/Microsoft.Toolkit/MainPage.xaml.cs
+++ /dev/null
@@ -1,21 +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;
-
-namespace SmokeTest
-{
-    public sealed partial class MainPage
-    {
-        public MainPage()
-        {
-            InitializeComponent();
-        }
-
-        private void Button_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
-        {
-            textBlock.Text = textBox.Text?.IsEmail().ToString() ?? "False";
-        }
-    }
-}
\ No newline at end of file
diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj
index d9a87784a71..fe28bced3aa 100644
--- a/SmokeTests/SmokeTests.proj
+++ b/SmokeTests/SmokeTests.proj
@@ -6,10 +6,6 @@
     <ToolkitPackages>
       UWPBaseline;
       UWPBaselineWinUI;
-      Microsoft.Toolkit;
-      Microsoft.Toolkit.Diagnostics;
-      Microsoft.Toolkit.HighPerformance;
-      Microsoft.Toolkit.Mvvm;
       Microsoft.Toolkit.Uwp;
       Microsoft.Toolkit.Uwp.Connectivity;
       Microsoft.Toolkit.Uwp.DeveloperTools;
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index b59993b451d..70ce6743c4f 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -168,6 +168,15 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.12</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit">
+      <Version>7.1.2</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit.Diagnostics">
+      <Version>7.1.2</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit.Mvvm">
+      <Version>7.1.2</Version>
+    </PackageReference>
     <PackageReference Include="MUXAppTestHelpers">
       <Version>0.0.4</Version>
     </PackageReference>
@@ -179,14 +188,6 @@
     <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.Uwp.Connectivity\Microsoft.Toolkit.Uwp.Connectivity.csproj">
       <Project>{b1e850ff-dde6-44d5-a830-34250e97a687}</Project>
       <Name>Microsoft.Toolkit.Uwp.Connectivity</Name>
@@ -243,10 +244,6 @@
       <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>
diff --git a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
index b060dd32c9f..733e4c0e7a7 100644
--- a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
+++ b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <!-- MSTest -->
+    <PackageReference Include="Microsoft.Toolkit" Version="7.1.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
diff --git a/UnitTests/Extensions/Test_TaskExtensions.cs b/UnitTests/Extensions/Test_TaskExtensions.cs
deleted file mode 100644
index 15b37341386..00000000000
--- a/UnitTests/Extensions/Test_TaskExtensions.cs
+++ /dev/null
@@ -1,51 +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.Tasks;
-using Microsoft.Toolkit;
-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());
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj b/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj
deleted file mode 100644
index 81af94a489d..00000000000
--- a/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.HighPerformance\Microsoft.Toolkit.HighPerformance.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-  </ItemGroup>
-
-  <!-- .NET Core 2.1 doesn't have the Unsafe type -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
-  </ItemGroup>
-
-  <Import Project="..\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems" Label="Shared" />
-
-</Project>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs
deleted file mode 100644
index c2bee6cd15b..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Internals/UnmanagedSpanOwner.cs
+++ /dev/null
@@ -1,82 +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.Buffers;
-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> : MemoryManager<T>
-        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;
-        }
-
-        /// <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;
-
-        /// <inheritdoc/>
-        protected override void Dispose(bool disposing)
-        {
-            IntPtr ptr = this.ptr;
-
-            if (ptr == IntPtr.Zero)
-            {
-                return;
-            }
-
-            this.ptr = IntPtr.Zero;
-
-            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();
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs
deleted file mode 100644
index 78a1f1dffd7..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_ArrayPoolBufferWriter{T}.cs
+++ /dev/null
@@ -1,231 +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.CodeAnalysis;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.Toolkit.HighPerformance.Buffers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using UnitTests.HighPerformance.Shared.Buffers;
-
-namespace UnitTests.HighPerformance.Buffers
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_ArrayPoolBufferWriterOfT
-    {
-        [TestCategory("ArrayPoolBufferWriterOfT")]
-        [TestMethod]
-        [DataRow(0, 256)] // 256 is the default initial size for ArrayPoolBufferWriter<T>
-        [DataRow(4, 256)]
-        [DataRow(7, 256)]
-        [DataRow(27, 256)]
-        [DataRow(188, 256)]
-        [DataRow(257, 512)]
-        [DataRow(358, 512)]
-        [DataRow(799, 1024)]
-        [DataRow(1024, 1024)]
-        [DataRow(1025, 2048)]
-        [DataRow((1024 * 1024) - 1, 1024 * 1024)]
-        [DataRow(1024 * 1024, 1024 * 1024)]
-        [DataRow((1024 * 1024) + 1, 2 * 1024 * 1024)]
-        [DataRow(2 * 1024 * 1024, 2 * 1024 * 1024)]
-        [DataRow((2 * 1024 * 1024) + 1, 4 * 1024 * 1024)]
-        [DataRow(3 * 1024 * 1024, 4 * 1024 * 1024)]
-        public void Test_ArrayPoolBufferWriterOfT_BufferSize(int request, int expected)
-        {
-            using var writer = new ArrayPoolBufferWriter<byte>();
-
-            // Request a Span<T> of a specified size and discard it. We're just invoking this
-            // method to force the ArrayPoolBufferWriter<T> instance to internally resize the
-            // buffer to ensure it can contain at least this number of items. After this, we
-            // can use reflection to get the internal array and ensure the size equals the
-            // expected one, which matches the "round up to power of 2" logic we need. This
-            // is documented within the resize method in ArrayPoolBufferWriter<T>, and it's
-            // done to prevent repeated allocations of arrays in some scenarios.
-            _ = writer.GetSpan(request);
-
-            var arrayFieldInfo = typeof(ArrayPoolBufferWriter<byte>).GetField("array", BindingFlags.Instance | BindingFlags.NonPublic);
-
-            byte[] array = (byte[])arrayFieldInfo!.GetValue(writer);
-
-            Assert.AreEqual(array!.Length, expected);
-        }
-
-        [TestCategory("ArrayPoolBufferWriterOfT")]
-        [TestMethod]
-        public void Test_ArrayPoolBufferWriterOfT_AllocateAndGetMemoryAndSpan()
-        {
-            var writer = new ArrayPoolBufferWriter<byte>();
-
-            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));
-        }
-
-        [TestCategory("ArrayPoolBufferWriterOfT")]
-        [TestMethod]
-        public void Test_ArrayPoolBufferWriterOfT_AllocateFromCustomPoolAndGetMemoryAndSpan()
-        {
-            var pool = new TrackingArrayPool<byte>();
-
-            using (var writer = new ArrayPoolBufferWriter<byte>(pool))
-            {
-                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))]
-        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()
-        {
-            using var writer = new ArrayPoolBufferWriter<byte>();
-
-            Span<byte> span = writer.GetSpan(4).Slice(0, 4);
-
-            byte[] data = { 1, 2, 3, 4 };
-
-            data.CopyTo(span);
-
-            writer.Advance(4);
-
-            Assert.AreEqual(writer.WrittenCount, 4);
-            Assert.IsTrue(span.SequenceEqual(data));
-
-            writer.Clear();
-
-            Assert.AreEqual(writer.WrittenCount, 0);
-            Assert.IsTrue(span.ToArray().All(b => b == 0));
-        }
-
-        [TestCategory("ArrayPoolBufferWriterOfT")]
-        [TestMethod]
-        public void Test_ArrayPoolBufferWriterOfT_MultipleDispose()
-        {
-            var writer = new ArrayPoolBufferWriter<byte>();
-
-            writer.Dispose();
-            writer.Dispose();
-            writer.Dispose();
-            writer.Dispose();
-        }
-
-        [TestCategory("ArrayPoolBufferWriterOfT")]
-        [TestMethod]
-        public void Test_ArrayPoolBufferWriterOfT_AsStream()
-        {
-            const int GuidSize = 16;
-
-            var writer = new ArrayPoolBufferWriter<byte>();
-            var guid = Guid.NewGuid();
-
-            // Here we first get a stream with the extension targeting ArrayPoolBufferWriter<T>.
-            // This will wrap it into a custom internal stream type and produce a write-only
-            // stream that essentially mirrors the IBufferWriter<T> functionality as a stream.
-            using (Stream writeStream = writer.AsStream())
-            {
-                writeStream.Write(guid);
-            }
-
-            Assert.AreEqual(writer.WrittenCount, GuidSize);
-
-            // Here we get a readable stream instead, and read from it to ensure
-            // the previous data was written correctly from the writeable stream.
-            using (Stream stream = writer.WrittenMemory.AsStream())
-            {
-                Assert.AreEqual(stream.Length, GuidSize);
-
-                byte[] result = new byte[GuidSize];
-
-                stream.Read(result, 0, result.Length);
-
-                // Read the guid data and ensure it matches our initial guid
-                Assert.IsTrue(new Guid(result).Equals(guid));
-            }
-
-            // Do a dummy write just to ensure the writer isn't disposed here.
-            // This is because we got a stream from a memory, not a memory owner.
-            writer.Write((byte)42);
-            writer.Advance(1);
-
-            writer.Dispose();
-
-            // Now check that the writer is actually disposed instead
-            Assert.ThrowsException<ObjectDisposedException>(() => writer.Capacity);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryBufferWriter{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryBufferWriter{T}.cs
deleted file mode 100644
index e6091671d42..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryBufferWriter{T}.cs
+++ /dev/null
@@ -1,80 +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.CodeAnalysis;
-using System.Linq;
-using Microsoft.Toolkit.HighPerformance.Buffers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Buffers
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_MemoryBufferWriterOfT
-    {
-        [TestCategory("MemoryBufferWriterOfT")]
-        [TestMethod]
-        public void Test_MemoryBufferWriterOfT_AllocateAndGetMemoryAndSpan()
-        {
-            Memory<byte> memory = new byte[256];
-
-            var writer = new MemoryBufferWriter<byte>(memory);
-
-            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.AreEqual(span.Length, memory.Length);
-
-            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.AreEqual(memory.Length - 43, writer.GetSpan().Length);
-            Assert.AreEqual(memory.Length - 43, writer.GetMemory().Length);
-            Assert.AreEqual(memory.Length - 43, writer.GetSpan(22).Length);
-            Assert.AreEqual(memory.Length - 43, writer.GetMemory(22).Length);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => writer.Advance(-1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => writer.GetMemory(-1));
-            Assert.ThrowsException<ArgumentException>(() => writer.GetSpan(1024));
-            Assert.ThrowsException<ArgumentException>(() => writer.GetMemory(1024));
-            Assert.ThrowsException<ArgumentException>(() => writer.Advance(1024));
-        }
-
-        [TestCategory("MemoryBufferWriterOfT")]
-        [TestMethod]
-        public void Test_MemoryBufferWriterOfT_Clear()
-        {
-            Memory<byte> memory = new byte[256];
-
-            var writer = new MemoryBufferWriter<byte>(memory);
-
-            Span<byte> span = writer.GetSpan(4).Slice(0, 4);
-
-            byte[] data = { 1, 2, 3, 4 };
-
-            data.CopyTo(span);
-
-            writer.Advance(4);
-
-            Assert.AreEqual(writer.WrittenCount, 4);
-            Assert.IsTrue(span.SequenceEqual(data));
-
-            writer.Clear();
-
-            Assert.AreEqual(writer.WrittenCount, 0);
-            Assert.IsTrue(span.ToArray().All(b => b == 0));
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs
deleted file mode 100644
index 0896dcfb28d..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_MemoryOwner{T}.cs
+++ /dev/null
@@ -1,166 +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.CodeAnalysis;
-using System.Linq;
-using Microsoft.Toolkit.HighPerformance.Buffers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using UnitTests.HighPerformance.Shared.Buffers;
-
-namespace UnitTests.HighPerformance.Buffers
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_MemoryOwnerOfT
-    {
-        [TestCategory("MemoryOwnerOfT")]
-        [TestMethod]
-        public void Test_MemoryOwnerOfT_AllocateAndGetMemoryAndSpan()
-        {
-            using var buffer = MemoryOwner<int>.Allocate(127);
-
-            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));
-        }
-
-        [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))]
-        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))]
-        public void Test_MemoryOwnerOfT_DisposedMemory()
-        {
-            var buffer = MemoryOwner<int>.Allocate(127);
-
-            buffer.Dispose();
-
-            _ = buffer.Memory;
-        }
-
-        [TestCategory("MemoryOwnerOfT")]
-        [TestMethod]
-        [ExpectedException(typeof(ObjectDisposedException))]
-        public void Test_MemoryOwnerOfT_DisposedSpan()
-        {
-            var buffer = MemoryOwner<int>.Allocate(127);
-
-            buffer.Dispose();
-
-            _ = buffer.Span;
-        }
-
-        [TestCategory("MemoryOwnerOfT")]
-        [TestMethod]
-        public void Test_MemoryOwnerOfT_MultipleDispose()
-        {
-            var buffer = MemoryOwner<int>.Allocate(127);
-
-            buffer.Dispose();
-            buffer.Dispose();
-            buffer.Dispose();
-            buffer.Dispose();
-
-            // This test consists in just getting here without crashes.
-            // We're validating that calling Dispose multiple times
-            // by accident doesn't cause issues, and just does nothing.
-        }
-
-        [TestCategory("MemoryOwnerOfT")]
-        [TestMethod]
-        public void Test_MemoryOwnerOfT_PooledBuffersAndClear()
-        {
-            using (var buffer = MemoryOwner<int>.Allocate(127))
-            {
-                buffer.Span.Fill(42);
-            }
-
-            using (var buffer = MemoryOwner<int>.Allocate(127))
-            {
-                Assert.IsTrue(buffer.Span.ToArray().All(i => i == 42));
-            }
-
-            using (var buffer = MemoryOwner<int>.Allocate(127, AllocationMode.Clear))
-            {
-                Assert.IsTrue(buffer.Span.ToArray().All(i => i == 0));
-            }
-        }
-
-        [TestCategory("MemoryOwnerOfT")]
-        [TestMethod]
-        public void Test_MemoryOwnerOfT_AllocateAndGetArray()
-        {
-            var buffer = MemoryOwner<int>.Allocate(127);
-
-            // Here we allocate a MemoryOwner<T> instance with a requested size of 127, which means it
-            // internally requests an array of size 127 from ArrayPool<T>.Shared. We then get the array
-            // segment, so we need to verify that (since buffer is not disposed) the returned array is
-            // not null, is of size >= the requested one (since ArrayPool<T> by definition returns an
-            // array that is at least of the requested size), and that the offset and count properties
-            // match our input values (same length, and offset at 0 since the buffer was not sliced).
-            var segment = buffer.DangerousGetArray();
-
-            Assert.IsNotNull(segment.Array);
-            Assert.IsTrue(segment.Array.Length >= buffer.Length);
-            Assert.AreEqual(segment.Offset, 0);
-            Assert.AreEqual(segment.Count, buffer.Length);
-
-            var second = buffer.Slice(10, 80);
-
-            // The original buffer instance is disposed here, because calling Slice transfers
-            // the ownership of the internal buffer to the new instance (this is documented in
-            // XML docs for the MemoryOwner<T>.Slice method).
-            Assert.ThrowsException<ObjectDisposedException>(() => buffer.DangerousGetArray());
-
-            segment = second.DangerousGetArray();
-
-            // Same as before, but we now also verify the initial offset != 0, as we used Slice
-            Assert.IsNotNull(segment.Array);
-            Assert.IsTrue(segment.Array.Length >= second.Length);
-            Assert.AreEqual(segment.Offset, 10);
-            Assert.AreEqual(segment.Count, second.Length);
-
-            second.Dispose();
-
-            Assert.ThrowsException<ObjectDisposedException>(() => second.DangerousGetArray());
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs
deleted file mode 100644
index 1ef3cb23523..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_SpanOwner{T}.cs
+++ /dev/null
@@ -1,101 +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.CodeAnalysis;
-using System.Linq;
-using Microsoft.Toolkit.HighPerformance.Buffers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using UnitTests.HighPerformance.Shared.Buffers;
-
-namespace UnitTests.HighPerformance.Buffers
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_SpanOwnerOfT
-    {
-        [TestCategory("SpanOwnerOfT")]
-        [TestMethod]
-        public void Test_SpanOwnerOfT_AllocateAndGetMemoryAndSpan()
-        {
-            using var buffer = SpanOwner<int>.Allocate(127);
-
-            Assert.IsTrue(buffer.Length == 127);
-            Assert.IsTrue(buffer.Span.Length == 127);
-
-            buffer.Span.Fill(42);
-
-            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, pool))
-            {
-                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))]
-        public void Test_SpanOwnerOfT_InvalidRequestedSize()
-        {
-            using var buffer = SpanOwner<int>.Allocate(-1);
-
-            Assert.Fail("You shouldn't be here");
-        }
-
-        [TestCategory("SpanOwnerOfT")]
-        [TestMethod]
-        public void Test_SpanOwnerOfT_PooledBuffersAndClear()
-        {
-            using (var buffer = SpanOwner<int>.Allocate(127))
-            {
-                buffer.Span.Fill(42);
-            }
-
-            using (var buffer = SpanOwner<int>.Allocate(127))
-            {
-                Assert.IsTrue(buffer.Span.ToArray().All(i => i == 42));
-            }
-
-            using (var buffer = SpanOwner<int>.Allocate(127, AllocationMode.Clear))
-            {
-                Assert.IsTrue(buffer.Span.ToArray().All(i => i == 0));
-            }
-        }
-
-        [TestCategory("SpanOwnerOfT")]
-        [TestMethod]
-        public void Test_SpanOwnerOfT_AllocateAndGetArray()
-        {
-            using var buffer = SpanOwner<int>.Allocate(127);
-
-            var segment = buffer.DangerousGetArray();
-
-            // See comments in the MemoryOwner<T> tests about this. The main difference
-            // here is that we don't do the disposed checks, as SpanOwner<T> is optimized
-            // with the assumption that usages after dispose are undefined behavior. This
-            // is all documented in the XML docs for the SpanOwner<T> type.
-            Assert.IsNotNull(segment.Array);
-            Assert.IsTrue(segment.Array.Length >= buffer.Length);
-            Assert.AreEqual(segment.Offset, 0);
-            Assert.AreEqual(segment.Count, buffer.Length);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
deleted file mode 100644
index 269ea82c910..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/Test_StringPool.cs
+++ /dev/null
@@ -1,344 +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 System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Text;
-using Microsoft.Toolkit.HighPerformance.Buffers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-#nullable enable
-
-namespace UnitTests.HighPerformance.Buffers
-{
-    [TestClass]
-    public class Test_StringPool
-    {
-        [TestCategory("StringPool")]
-        [TestMethod]
-        [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 maps = (Array)typeof(StringPool).GetField("maps", BindingFlags.Instance | BindingFlags.NonPublic)!.GetValue(pool)!;
-
-            Assert.AreEqual(x, maps.Length);
-
-            Type bucketType = Type.GetType("Microsoft.Toolkit.HighPerformance.Buffers.StringPool+FixedSizePriorityMap, Microsoft.Toolkit.HighPerformance")!;
-
-            int[] buckets = (int[])bucketType.GetField("buckets", BindingFlags.Instance | BindingFlags.NonPublic)!.GetValue(maps.GetValue(0))!;
-
-            Assert.AreEqual(y, buckets.Length);
-        }
-
-        [TestCategory("StringPool")]
-        [TestMethod]
-        [DataRow(0)]
-        [DataRow(-3248234)]
-        [DataRow(int.MinValue)]
-        public void Test_StringPool_Cctor_Fail(int size)
-        {
-            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")]
-        [TestMethod]
-        public void Test_StringPool_Add_Empty()
-        {
-            StringPool.Shared.Add(string.Empty);
-
-            bool found = StringPool.Shared.TryGet(ReadOnlySpan<char>.Empty, out string? text);
-
-            Assert.IsTrue(found);
-            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()
-        {
-            var pool = new StringPool();
-
-            string
-                hello = nameof(hello),
-                helloworld = nameof(helloworld),
-                windowsCommunityToolkit = nameof(windowsCommunityToolkit);
-
-            Assert.IsFalse(pool.TryGet(hello.AsSpan(), out _));
-            Assert.IsFalse(pool.TryGet(helloworld.AsSpan(), out _));
-            Assert.IsFalse(pool.TryGet(windowsCommunityToolkit.AsSpan(), out _));
-
-            pool.Add(hello);
-            pool.Add(helloworld);
-            pool.Add(windowsCommunityToolkit);
-
-            Assert.IsTrue(pool.TryGet(hello.AsSpan(), out string? hello2));
-            Assert.IsTrue(pool.TryGet(helloworld.AsSpan(), out string? world2));
-            Assert.IsTrue(pool.TryGet(windowsCommunityToolkit.AsSpan(), out string? windowsCommunityToolkit2));
-
-            Assert.AreSame(hello, hello2);
-            Assert.AreSame(helloworld, world2);
-            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()
-        {
-            string empty = StringPool.Shared.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.Shared.GetOrAdd(ReadOnlySpan<char>.Empty);
-
-            Assert.AreSame(string.Empty, empty);
-        }
-
-        [TestCategory("StringPool")]
-        [TestMethod]
-        public void Test_StringPool_GetOrAdd_ReadOnlySpan_Misc()
-        {
-            var pool = new StringPool();
-
-            string
-                hello = pool.GetOrAdd(nameof(hello).AsSpan()),
-                helloworld = pool.GetOrAdd(nameof(helloworld).AsSpan()),
-                windowsCommunityToolkit = pool.GetOrAdd(nameof(windowsCommunityToolkit).AsSpan());
-
-            Assert.AreEqual(nameof(hello), hello);
-            Assert.AreEqual(nameof(helloworld), helloworld);
-            Assert.AreEqual(nameof(windowsCommunityToolkit), windowsCommunityToolkit);
-
-            Assert.AreSame(hello, pool.GetOrAdd(hello.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(helloworld), helloworld);
-            Assert.AreEqual(nameof(windowsCommunityToolkit), windowsCommunityToolkit);
-
-            Assert.AreNotSame(hello, pool.GetOrAdd(hello.AsSpan()));
-            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.Shared.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);
-        }
-
-        [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());
-            }
-
-            // 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")!;
-            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++)
-            {
-                object map = maps.GetValue(i)!;
-
-                timestampInfo.SetValue(map, uint.MaxValue);
-
-                maps.SetValue(map, i);
-            }
-
-            // Force an overflow
-            string text = "Hello world";
-
-            _ = pool.GetOrAdd(text);
-
-            Type 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));
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/TrackingArrayPool{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Buffers/TrackingArrayPool{T}.cs
deleted file mode 100644
index 47ed527b190..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Buffers/TrackingArrayPool{T}.cs
+++ /dev/null
@@ -1,39 +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.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);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_ReadOnlyRefEnumerable{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_ReadOnlyRefEnumerable{T}.cs
deleted file mode 100644
index c4c6470fdb3..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_ReadOnlyRefEnumerable{T}.cs
+++ /dev/null
@@ -1,131 +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.
-
-#if !WINDOWS_UWP
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance.Enumerables;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Enumerables
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_ReadOnlyRefEnumerable
-    {
-        [TestCategory("ReadOnlyRefEnumerable")]
-        [TestMethod]
-        [DataRow(1, 1, new[] { 1 })]
-        [DataRow(4, 1, new[] { 1, 2, 3, 4 })]
-        [DataRow(4, 4, new[] { 1, 5, 9, 13 })]
-        [DataRow(4, 5, new[] { 1, 6, 11, 16 })]
-        public void Test_ReadOnlyRefEnumerable_DangerousCreate_Ok(int length, int step, int[] values)
-        {
-            Span<int> data = new[]
-            {
-                1, 2, 3, 4,
-                5, 6, 7, 8,
-                9, 10, 11, 12,
-                13, 14, 15, 16
-            };
-
-            ReadOnlyRefEnumerable<int> enumerable = ReadOnlyRefEnumerable<int>.DangerousCreate(in data[0], length, step);
-
-            int[] result = enumerable.ToArray();
-
-            CollectionAssert.AreEqual(result, values);
-        }
-
-        [TestCategory("ReadOnlyRefEnumerable")]
-        [TestMethod]
-        [DataRow(-44, 10)]
-        [DataRow(10, -14)]
-        [DataRow(-32, -1)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_ReadOnlyRefEnumerable_DangerousCreate_BelowZero(int length, int step)
-        {
-            _ = ReadOnlyRefEnumerable<int>.DangerousCreate(in Unsafe.NullRef<int>(), length, step);
-        }
-
-        [TestCategory("ReadOnlyRefEnumerable")]
-        [TestMethod]
-        [DataRow(1, new[] { 1 })]
-        [DataRow(1, new[] { 1, 2, 3, 4 })]
-        [DataRow(4, new[] { 1, 5, 9, 13 })]
-        [DataRow(5, new[] { 1, 6, 11, 16 })]
-        public void Test_ReadOnlyRefEnumerable_Indexer(int step, int[] values)
-        {
-            Span<int> data = new[]
-            {
-                1, 2, 3, 4,
-                5, 6, 7, 8,
-                9, 10, 11, 12,
-                13, 14, 15, 16
-            };
-
-            ReadOnlyRefEnumerable<int> enumerable = ReadOnlyRefEnumerable<int>.DangerousCreate(in data[0], values.Length, step);
-
-            for (int i = 0; i < enumerable.Length; i++)
-            {
-                Assert.AreEqual(enumerable[i], values[i]);
-            }
-        }
-
-        [TestCategory("ReadOnlyRefEnumerable")]
-        [TestMethod]
-        public void Test_ReadOnlyRefEnumerable_Indexer_ThrowsIndexOutOfRange()
-        {
-            int[] array = new[]
-            {
-                0, 0, 0, 0
-            };
-
-            Assert.ThrowsException<IndexOutOfRangeException>(() => ReadOnlyRefEnumerable<int>.DangerousCreate(in array[0], array.Length, 1)[-1]);
-            Assert.ThrowsException<IndexOutOfRangeException>(() => ReadOnlyRefEnumerable<int>.DangerousCreate(in array[0], array.Length, 1)[array.Length]);
-        }
-
-#if NETCOREAPP3_1_OR_GREATER
-        [TestCategory("ReadOnlyRefEnumerable")]
-        [TestMethod]
-        [DataRow(1, new[] { 1 })]
-        [DataRow(1, new[] { 1, 2, 3, 4 })]
-        [DataRow(4, new[] { 1, 5, 9, 13 })]
-        [DataRow(5, new[] { 1, 6, 11, 16 })]
-        public void Test_ReadOnlyRefEnumerable_Index_Indexer(int step, int[] values)
-        {
-            Span<int> data = new[]
-            {
-                1, 2, 3, 4,
-                5, 6, 7, 8,
-                9, 10, 11, 12,
-                13, 14, 15, 16
-            };
-
-            ReadOnlyRefEnumerable<int> enumerable = ReadOnlyRefEnumerable<int>.DangerousCreate(in data[0], values.Length, step);
-
-            for (int i = 1; i <= enumerable.Length; i++)
-            {
-                Assert.AreEqual(values[^i], enumerable[^i]);
-            }
-        }
-
-        [TestCategory("ReadOnlyRefEnumerable")]
-        [TestMethod]
-        public void Test_ReadOnlyRefEnumerable_Index_Indexer_ThrowsIndexOutOfRange()
-        {
-            int[] array = new[]
-            {
-                0, 0, 0, 0
-            };
-
-            Assert.ThrowsException<IndexOutOfRangeException>(() => ReadOnlyRefEnumerable<int>.DangerousCreate(in array[0], array.Length, 1)[new Index(array.Length)]);
-            Assert.ThrowsException<IndexOutOfRangeException>(() => ReadOnlyRefEnumerable<int>.DangerousCreate(in array[0], array.Length, 1)[^0]);
-        }
-#endif
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_RefEnumerable{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_RefEnumerable{T}.cs
deleted file mode 100644
index 4c37642b515..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Enumerables/Test_RefEnumerable{T}.cs
+++ /dev/null
@@ -1,131 +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.
-
-#if !WINDOWS_UWP
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance.Enumerables;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Enumerables
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_RefEnumerable
-    {
-        [TestCategory("RefEnumerable")]
-        [TestMethod]
-        [DataRow(1, 1, new[] { 1 })]
-        [DataRow(4, 1, new[] { 1, 2, 3, 4 })]
-        [DataRow(4, 4, new[] { 1, 5, 9, 13 })]
-        [DataRow(4, 5, new[] { 1, 6, 11, 16 })]
-        public void Test_RefEnumerable_DangerousCreate_Ok(int length, int step, int[] values)
-        {
-            Span<int> data = new[]
-            {
-                1, 2, 3, 4,
-                5, 6, 7, 8,
-                9, 10, 11, 12,
-                13, 14, 15, 16
-            };
-
-            RefEnumerable<int> enumerable = RefEnumerable<int>.DangerousCreate(ref data[0], length, step);
-
-            int[] result = enumerable.ToArray();
-
-            CollectionAssert.AreEqual(result, values);
-        }
-
-        [TestCategory("RefEnumerable")]
-        [TestMethod]
-        [DataRow(-44, 10)]
-        [DataRow(10, -14)]
-        [DataRow(-32, -1)]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_RefEnumerable_DangerousCreate_BelowZero(int length, int step)
-        {
-            _ = RefEnumerable<int>.DangerousCreate(ref Unsafe.NullRef<int>(), length, step);
-        }
-
-        [TestCategory("RefEnumerable")]
-        [TestMethod]
-        [DataRow(1, new[] { 1 })]
-        [DataRow(1, new[] { 1, 2, 3, 4 })]
-        [DataRow(4, new[] { 1, 5, 9, 13 })]
-        [DataRow(5, new[] { 1, 6, 11, 16 })]
-        public void Test_RefEnumerable_Indexer(int step, int[] values)
-        {
-            Span<int> data = new[]
-            {
-                1, 2, 3, 4,
-                5, 6, 7, 8,
-                9, 10, 11, 12,
-                13, 14, 15, 16
-            };
-
-            RefEnumerable<int> enumerable = RefEnumerable<int>.DangerousCreate(ref data[0], values.Length, step);
-
-            for (int i = 0; i < enumerable.Length; i++)
-            {
-                Assert.AreEqual(enumerable[i], values[i]);
-            }
-        }
-
-        [TestCategory("RefEnumerable")]
-        [TestMethod]
-        public void Test_RefEnumerable_Indexer_ThrowsIndexOutOfRange()
-        {
-            int[] array = new[]
-            {
-                0, 0, 0, 0
-            };
-
-            Assert.ThrowsException<IndexOutOfRangeException>(() => RefEnumerable<int>.DangerousCreate(ref array[0], array.Length, 1)[-1]);
-            Assert.ThrowsException<IndexOutOfRangeException>(() => RefEnumerable<int>.DangerousCreate(ref array[0], array.Length, 1)[array.Length]);
-        }
-
-#if NETCOREAPP3_1_OR_GREATER
-        [TestCategory("RefEnumerable")]
-        [TestMethod]
-        [DataRow(1, new[] { 1 })]
-        [DataRow(1, new[] { 1, 2, 3, 4 })]
-        [DataRow(4, new[] { 1, 5, 9, 13 })]
-        [DataRow(5, new[] { 1, 6, 11, 16 })]
-        public void Test_RefEnumerable_Index_Indexer(int step, int[] values)
-        {
-            Span<int> data = new[]
-            {
-                1, 2, 3, 4,
-                5, 6, 7, 8,
-                9, 10, 11, 12,
-                13, 14, 15, 16
-            };
-
-            RefEnumerable<int> enumerable = RefEnumerable<int>.DangerousCreate(ref data[0], values.Length, step);
-
-            for (int i = 1; i <= enumerable.Length; i++)
-            {
-                Assert.AreEqual(values[^i], enumerable[^i]);
-            }
-        }
-
-        [TestCategory("RefEnumerable")]
-        [TestMethod]
-        public void Test_RefEnumerable_Index_Indexer_ThrowsIndexOutOfRange()
-        {
-            int[] array = new[]
-            {
-                0, 0, 0, 0
-            };
-
-            Assert.ThrowsException<IndexOutOfRangeException>(() => RefEnumerable<int>.DangerousCreate(ref array[0], array.Length, 1)[new Index(array.Length)]);
-            Assert.ThrowsException<IndexOutOfRangeException>(() => RefEnumerable<int>.DangerousCreate(ref array[0], array.Length, 1)[^0]);
-        }
-#endif
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.1D.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.1D.cs
deleted file mode 100644
index d54d10c9b85..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.1D.cs
+++ /dev/null
@@ -1,58 +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.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1601", Justification = "Partial test class")]
-    public partial class Test_ArrayExtensions
-    {
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_DangerousGetReference()
-        {
-            string[] tokens = "aa,bb,cc,dd,ee,ff,gg,hh,ii".Split(',');
-
-            // In all these "DangerousGetReference" tests, we need to ensure that a reference to a given
-            // item within an array is effectively the one corresponding to the one whe expect, which is
-            // either a reference to the first item if we use "DangerousGetReference", or one to the n-th
-            // item if we use "DangerousGetReferenceAt". So all these tests just invoke the API and then
-            // compare the returned reference against an existing baseline (like the built-in array indexer)
-            // to ensure that the two are the same. These are all managed references, so no need for pinning.
-            ref string r0 = ref Unsafe.AsRef(tokens.DangerousGetReference());
-            ref string r1 = ref Unsafe.AsRef(tokens[0]);
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_DangerousGetReferenceAt_Zero()
-        {
-            string[] tokens = "aa,bb,cc,dd,ee,ff,gg,hh,ii".Split(',');
-
-            ref string r0 = ref Unsafe.AsRef(tokens.DangerousGetReference());
-            ref string r1 = ref Unsafe.AsRef(tokens.DangerousGetReferenceAt(0));
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_DangerousGetReferenceAt_Index()
-        {
-            string[] tokens = "aa,bb,cc,dd,ee,ff,gg,hh,ii".Split(',');
-
-            ref string r0 = ref Unsafe.AsRef(tokens.DangerousGetReferenceAt(5));
-            ref string r1 = ref Unsafe.AsRef(tokens[5]);
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.2D.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.2D.cs
deleted file mode 100644
index 5c7f653a06e..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.2D.cs
+++ /dev/null
@@ -1,477 +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.HighPerformance;
-using Microsoft.Toolkit.HighPerformance.Enumerables;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    public partial class Test_ArrayExtensions
-    {
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_DangerousGetReference_Int()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3, 4 },
-                { 5, 6, 7, 8 },
-                { 9, 10, 11, 12 }
-            };
-
-            // See comments in Test_ArrayExtensions.1D for how these tests work
-            ref int r0 = ref array.DangerousGetReference();
-            ref int r1 = ref array[0, 0];
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_DangerousGetReference_String()
-        {
-            string[,] array =
-            {
-                { "a", "bb", "ccc" },
-                { "dddd", "eeeee", "ffffff" }
-            };
-
-            ref string r0 = ref array.DangerousGetReference();
-            ref string r1 = ref array[0, 0];
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_DangerousGetReferenceAt_Zero()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3, 4 },
-                { 5, 6, 7, 8 },
-                { 9, 10, 11, 12 }
-            };
-
-            ref int r0 = ref array.DangerousGetReferenceAt(0, 0);
-            ref int r1 = ref array[0, 0];
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_DangerousGetReferenceAt_Index()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3, 4 },
-                { 5, 6, 7, 8 },
-                { 9, 10, 11, 12 }
-            };
-
-            ref int r0 = ref array.DangerousGetReferenceAt(1, 3);
-            ref int r1 = ref array[1, 3];
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_AsSpan2DAndFillArrayMid()
-        {
-            bool[,] test = new bool[4, 5];
-
-            // To fill an array we now go through the Span2D<T> type, which includes all
-            // the necessary logic to perform the operation. In these tests we just create
-            // one through the extension, slice it and then fill it. For instance in this
-            // one, we're creating a Span2D<bool> from coordinates (1, 1), with a height of
-            // 2 and a width of 2, and then filling it. Then we just compare the results.
-            test.AsSpan2D(1, 1, 2, 3).Fill(true);
-
-            var expected = new[,]
-            {
-                { false, false, false, false, false },
-                { false,  true,  true,  true, false },
-                { false,  true,  true,  true, false },
-                { false, false, false, false, false },
-            };
-
-            CollectionAssert.AreEqual(expected, test);
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_AsSpan2DAndFillArrayTwice()
-        {
-            bool[,] test = new bool[4, 5];
-
-            test.AsSpan2D(0, 0, 2, 1).Fill(true);
-            test.AsSpan2D(1, 3, 2, 2).Fill(true);
-
-            var expected = new[,]
-            {
-                { true,  false, false, false, false },
-                { true,  false, false,  true,  true },
-                { false, false, false,  true,  true },
-                { false, false, false, false, false },
-            };
-
-            CollectionAssert.AreEqual(expected, test);
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_AsSpan2DAndFillArrayBottomEdgeBoundary()
-        {
-            bool[,] test = new bool[4, 5];
-
-            test.AsSpan2D(1, 2, 3, 2).Fill(true);
-
-            var expected = new[,]
-            {
-                { false, false, false, false, false },
-                { false, false,  true,  true, false },
-                { false, false,  true,  true, false },
-                { false, false,  true,  true, false },
-            };
-
-            CollectionAssert.AreEqual(expected, test);
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_AsSpan2DAndFillArrayBottomRightCornerBoundary()
-        {
-            bool[,] test = new bool[5, 4];
-
-            test.AsSpan2D(3, 2, 2, 2).Fill(true);
-
-            var expected = new[,]
-            {
-                { false, false, false, false },
-                { false, false, false, false },
-                { false, false, false, false },
-                { false, false,  true,  true },
-                { false, false,  true,  true },
-            };
-
-            CollectionAssert.AreEqual(expected, test);
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_GetRow_Rectangle()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3, 4 },
-                { 5, 6, 7, 8 },
-                { 9, 10, 11, 12 }
-            };
-
-            // Here we use the enumerator on the RefEnumerator<T> type to traverse items in a row
-            // by reference. For each one, we check that the reference does in fact point to the
-            // item we expect in the underlying array (in this case, items on row 1).
-            int j = 0;
-            foreach (ref int value in array.GetRow(1))
-            {
-                Assert.IsTrue(Unsafe.AreSame(ref value, ref array[1, j++]));
-            }
-
-            // Check that RefEnumerable<T>.ToArray() works correctly
-            CollectionAssert.AreEqual(array.GetRow(1).ToArray(), new[] { 5, 6, 7, 8 });
-
-            // Test an empty array
-            Assert.AreSame(new int[1, 0].GetRow(0).ToArray(), Array.Empty<int>());
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => array.GetRow(-1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => array.GetRow(3));
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => array.GetRow(20));
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_GetColumn_Rectangle()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3, 4 },
-                { 5, 6, 7, 8 },
-                { 9, 10, 11, 12 }
-            };
-
-            // Same as above, but this time we iterate a column instead (so non contiguous items)
-            int i = 0;
-            foreach (ref int value in array.GetColumn(1))
-            {
-                Assert.IsTrue(Unsafe.AreSame(ref value, ref array[i++, 1]));
-            }
-
-            CollectionAssert.AreEqual(array.GetColumn(1).ToArray(), new[] { 2, 6, 10 });
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => array.GetColumn(-1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => array.GetColumn(4));
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => array.GetColumn(20));
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_GetRow_Empty()
-        {
-            int[,] array = new int[0, 0];
-
-            // Try to get a row from an empty array (the row index isn't in range)
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => array.GetRow(0).ToArray());
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_GetRowOrColumn_Helpers()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3, 4 },
-                { 5, 6, 7, 8 },
-                { 9, 10, 11, 12 },
-                { 13, 14, 15, 16 }
-            };
-
-            // Get a row and test the Clear method. Note that the Span2D<T> here is sliced
-            // starting from the second column, so this method should clear the row from index 1.
-            array.AsSpan2D(1, 1, 3, 3).GetRow(0).Clear();
-
-            int[,] expected =
-            {
-                { 1, 2, 3, 4 },
-                { 5, 0, 0, 0 },
-                { 9, 10, 11, 12 },
-                { 13, 14, 15, 16 }
-            };
-
-            CollectionAssert.AreEqual(array, expected);
-
-            // Same as before, but this time we fill a column with a value
-            array.GetColumn(2).Fill(42);
-
-            expected = new[,]
-            {
-                { 1, 2, 42, 4 },
-                { 5, 0, 42, 0 },
-                { 9, 10, 42, 12 },
-                { 13, 14, 42, 16 }
-            };
-
-            CollectionAssert.AreEqual(array, expected);
-
-            int[] copy = new int[4];
-
-            // Get a row and copy items to a target span (in this case, wrapping an array)
-            array.GetRow(2).CopyTo(copy);
-
-            int[] result = { 9, 10, 42, 12 };
-
-            CollectionAssert.AreEqual(copy, result);
-
-            // Same as above, but copying from a column (so we test non contiguous sequences too)
-            array.GetColumn(1).CopyTo(copy);
-
-            result = new[] { 2, 0, 10, 14 };
-
-            CollectionAssert.AreEqual(copy, result);
-
-            // Some invalid attempts to copy to an empty span or sequence
-            Assert.ThrowsException<ArgumentException>(() => array.GetRow(0).CopyTo(default(RefEnumerable<int>)));
-            Assert.ThrowsException<ArgumentException>(() => array.GetRow(0).CopyTo(default(Span<int>)));
-
-            Assert.ThrowsException<ArgumentException>(() => array.GetColumn(0).CopyTo(default(RefEnumerable<int>)));
-            Assert.ThrowsException<ArgumentException>(() => array.GetColumn(0).CopyTo(default(Span<int>)));
-
-            // Same as CopyTo, but this will fail gracefully with an invalid target
-            Assert.IsTrue(array.GetRow(2).TryCopyTo(copy));
-            Assert.IsFalse(array.GetRow(0).TryCopyTo(default(Span<int>)));
-
-            result = new[] { 9, 10, 42, 12 };
-
-            CollectionAssert.AreEqual(copy, result);
-
-            // Also fill a row and then further down clear a column (trying out all possible combinations)
-            array.GetRow(2).Fill(99);
-
-            expected = new[,]
-            {
-                { 1, 2, 42, 4 },
-                { 5, 0, 42, 0 },
-                { 99, 99, 99, 99 },
-                { 13, 14, 42, 16 }
-            };
-
-            CollectionAssert.AreEqual(array, expected);
-
-            array.GetColumn(2).Clear();
-
-            expected = new[,]
-            {
-                { 1, 2, 0, 4 },
-                { 5, 0, 0, 0 },
-                { 99, 99, 0, 99 },
-                { 13, 14, 0, 16 }
-            };
-
-            CollectionAssert.AreEqual(array, expected);
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_ReadOnlyGetRowOrColumn_Helpers()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3, 4 },
-                { 5, 6, 7, 8 },
-                { 9, 10, 11, 12 },
-                { 13, 14, 15, 16 }
-            };
-
-            // This test pretty much does the same things as the method above, but this time
-            // using a source ReadOnlySpan2D<T>, so that the sequence type being tested is
-            // ReadOnlyRefEnumerable<T> instead (which shares most features but is separate).
-            ReadOnlySpan2D<int> span2D = array;
-
-            int[] copy = new int[4];
-
-            span2D.GetRow(2).CopyTo(copy);
-
-            int[] result = { 9, 10, 11, 12 };
-
-            CollectionAssert.AreEqual(copy, result);
-
-            span2D.GetColumn(1).CopyTo(copy);
-
-            result = new[] { 2, 6, 10, 14 };
-
-            CollectionAssert.AreEqual(copy, result);
-
-            Assert.ThrowsException<ArgumentException>(() => ((ReadOnlySpan2D<int>)array).GetRow(0).CopyTo(default(RefEnumerable<int>)));
-            Assert.ThrowsException<ArgumentException>(() => ((ReadOnlySpan2D<int>)array).GetRow(0).CopyTo(default(Span<int>)));
-
-            Assert.ThrowsException<ArgumentException>(() => ((ReadOnlySpan2D<int>)array).GetColumn(0).CopyTo(default(RefEnumerable<int>)));
-            Assert.ThrowsException<ArgumentException>(() => ((ReadOnlySpan2D<int>)array).GetColumn(0).CopyTo(default(Span<int>)));
-
-            Assert.IsTrue(span2D.GetRow(2).TryCopyTo(copy));
-            Assert.IsFalse(span2D.GetRow(2).TryCopyTo(default(Span<int>)));
-
-            result = new[] { 9, 10, 11, 12 };
-
-            CollectionAssert.AreEqual(copy, result);
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_RefEnumerable_Misc()
-        {
-            int[,] array1 =
-            {
-                { 1, 2, 3, 4 },
-                { 5, 6, 7, 8 },
-                { 9, 10, 11, 12 },
-                { 13, 14, 15, 16 }
-            };
-
-            int[,] array2 = new int[4, 4];
-
-            // Copy to enumerable with source step == 1, destination step == 1
-            array1.GetRow(0).CopyTo(array2.GetRow(0));
-
-            // Copy enumerable with source step == 1, destination step != 1
-            array1.GetRow(1).CopyTo(array2.GetColumn(1));
-
-            // Copy enumerable with source step != 1, destination step == 1
-            array1.GetColumn(2).CopyTo(array2.GetRow(2));
-
-            // Copy enumerable with source step != 1, destination step != 1
-            array1.GetColumn(3).CopyTo(array2.GetColumn(3));
-
-            int[,] result =
-            {
-                { 1, 5, 3, 4 },
-                { 0, 6, 0, 8 },
-                { 3, 7, 11, 12 },
-                { 0, 8, 0, 16 }
-            };
-
-            CollectionAssert.AreEqual(array2, result);
-
-            // Test a valid and an invalid TryCopyTo call with the RefEnumerable<T> overload
-            bool shouldBeTrue = array1.GetRow(0).TryCopyTo(array2.GetColumn(0));
-            bool shouldBeFalse = array1.GetRow(0).TryCopyTo(default(RefEnumerable<int>));
-
-            result = new[,]
-            {
-                { 1, 5, 3, 4 },
-                { 2, 6, 0, 8 },
-                { 3, 7, 11, 12 },
-                { 4, 8, 0, 16 }
-            };
-
-            CollectionAssert.AreEqual(array2, result);
-
-            Assert.IsTrue(shouldBeTrue);
-            Assert.IsFalse(shouldBeFalse);
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_GetColumn_Empty()
-        {
-            int[,] array = new int[0, 0];
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => array.GetColumn(0).ToArray());
-        }
-
-#if NETCOREAPP3_1 || NET5_0
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_AsSpan_Empty()
-        {
-            int[,] array = new int[0, 0];
-
-            Span<int> span = array.AsSpan();
-
-            // Check that the empty array was loaded properly
-            Assert.AreEqual(span.Length, array.Length);
-            Assert.IsTrue(span.IsEmpty);
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_2D_AsSpan_Populated()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3, 4 },
-                { 5, 6, 7, 8 },
-                { 9, 10, 11, 12 }
-            };
-
-            Span<int> span = array.AsSpan();
-
-            // Test the total length of the span
-            Assert.AreEqual(span.Length, array.Length);
-
-            ref int r0 = ref array[0, 0];
-            ref int r1 = ref span[0];
-
-            // Similarly to the top methods, here we compare a given reference to
-            // ensure they point to the right element back in the original array.
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-#endif
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.3D.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.3D.cs
deleted file mode 100644
index d3e3a3c0ee6..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayExtensions.3D.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.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    public partial class Test_ArrayExtensions
-    {
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_3D_DangerousGetReference_Int()
-        {
-            int[,,] array = new int[10, 20, 12];
-
-            // See comments in Test_ArrayExtensions.1D for how these tests work
-            ref int r0 = ref array.DangerousGetReference();
-            ref int r1 = ref array[0, 0, 0];
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_3D_DangerousGetReference_String()
-        {
-            string[,,] array = new string[10, 20, 12];
-
-            ref string r0 = ref array.DangerousGetReference();
-            ref string r1 = ref array[0, 0, 0];
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_3D_DangerousGetReferenceAt_Zero()
-        {
-            int[,,] array = new int[10, 20, 12];
-
-            ref int r0 = ref array.DangerousGetReferenceAt(0, 0, 0);
-            ref int r1 = ref array[0, 0, 0];
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_3D_DangerousGetReferenceAt_Index()
-        {
-            int[,,] array = new int[10, 20, 12];
-
-            ref int r0 = ref array.DangerousGetReferenceAt(5, 3, 4);
-            ref int r1 = ref array[5, 3, 4];
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayPoolExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayPoolExtensions.cs
deleted file mode 100644
index 76130c05a07..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ArrayPoolExtensions.cs
+++ /dev/null
@@ -1,97 +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.Buffers;
-using System.Linq;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    public class Test_ArrayPoolExtensions
-    {
-        [TestCategory("ArrayPoolExtensions")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_ArrayExtensions_InvalidSize()
-        {
-            int[] array = null;
-
-            ArrayPool<int>.Shared.Resize(ref array, -1);
-        }
-
-        [TestCategory("ArrayPoolExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_NewArray()
-        {
-            int[] array = null;
-
-            ArrayPool<int>.Shared.Resize(ref array, 10);
-
-            Assert.IsNotNull(array);
-            Assert.IsTrue(array.Length >= 10);
-        }
-
-        [TestCategory("ArrayPoolExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_SameSize()
-        {
-            int[] array = ArrayPool<int>.Shared.Rent(10);
-            int[] backup = array;
-
-            ArrayPool<int>.Shared.Resize(ref array, array.Length);
-
-            Assert.AreSame(array, backup);
-        }
-
-        [TestCategory("ArrayPoolExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_Expand()
-        {
-            int[] array = ArrayPool<int>.Shared.Rent(16);
-            int[] backup = array;
-
-            array.AsSpan().Fill(7);
-
-            ArrayPool<int>.Shared.Resize(ref array, 32);
-
-            Assert.AreNotSame(array, backup);
-            Assert.IsTrue(array.Length >= 32);
-            Assert.IsTrue(array.AsSpan(0, 16).ToArray().All(i => i == 7));
-        }
-
-        [TestCategory("ArrayPoolExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_Shrink()
-        {
-            int[] array = ArrayPool<int>.Shared.Rent(32);
-            int[] backup = array;
-
-            array.AsSpan().Fill(7);
-
-            ArrayPool<int>.Shared.Resize(ref array, 16);
-
-            Assert.AreNotSame(array, backup);
-            Assert.IsTrue(array.Length >= 16);
-            Assert.IsTrue(array.AsSpan(0, 16).ToArray().All(i => i == 7));
-        }
-
-        [TestCategory("ArrayPoolExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_Clear()
-        {
-            int[] array = ArrayPool<int>.Shared.Rent(16);
-            int[] backup = array;
-
-            array.AsSpan().Fill(7);
-
-            ArrayPool<int>.Shared.Resize(ref array, 0, true);
-
-            Assert.AreNotSame(array, backup);
-            Assert.IsTrue(backup.AsSpan(0, 16).ToArray().All(i => i == 0));
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_BoolExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_BoolExtensions.cs
deleted file mode 100644
index d09d1531113..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_BoolExtensions.cs
+++ /dev/null
@@ -1,50 +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.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    public class Test_BoolExtensions
-    {
-        [TestCategory("BoolExtensions")]
-        [TestMethod]
-        public void Test_BoolExtensions_True()
-        {
-            // There tests all just run a couple of boolean expressions and validate that the extension
-            // correctly produces either 1 or 0 depending on whether the expression was true or false.
-            Assert.AreEqual(1, true.ToByte(), nameof(Test_BoolExtensions_True));
-            Assert.AreEqual(1, (DateTime.Now.Year > 0).ToByte(), nameof(Test_BoolExtensions_True));
-        }
-
-        [TestCategory("BoolExtensions")]
-        [TestMethod]
-        public void Test_BoolExtensions_False()
-        {
-            Assert.AreEqual(0, false.ToByte(), nameof(Test_BoolExtensions_False));
-            Assert.AreEqual(0, (DateTime.Now.Year > 3000).ToByte(), nameof(Test_BoolExtensions_False));
-        }
-
-        [TestCategory("BoolExtensions")]
-        [TestMethod]
-        [DataRow(true, -1)]
-        [DataRow(false, 0)]
-        public void Test_BoolExtensions_ToBitwiseMask32(bool value, int result)
-        {
-            Assert.AreEqual(value.ToBitwiseMask32(), result);
-        }
-
-        [TestCategory("BoolExtensions")]
-        [TestMethod]
-        [DataRow(true, -1)]
-        [DataRow(false, 0)]
-        public void Test_BoolExtensions_ToBitwiseMask64(bool value, long result)
-        {
-            Assert.AreEqual(value.ToBitwiseMask64(), result);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_HashCodeExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_HashCodeExtensions.cs
deleted file mode 100644
index f96469917aa..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_HashCodeExtensions.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 System.Diagnostics.Contracts;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.Toolkit.HighPerformance.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    public class Test_HashCodeExtensions
-    {
-        /// <summary>
-        /// Gets the list of counts to test the extension for
-        /// </summary>
-        private static ReadOnlySpan<int> TestCounts => new[] { 0, 1, 7, 128, 255, 256, short.MaxValue, 245_000 };
-
-        [TestCategory("HashCodeOfT")]
-        [TestMethod]
-        public void Test_HashCodeOfT_VectorSupportedTypes_TestRepeatCount8()
-        {
-            TestForType<byte>();
-            TestForType<sbyte>();
-            TestForType<bool>();
-        }
-
-        [TestCategory("HashCodeOfT")]
-        [TestMethod]
-        public void Test_HashCodeOfT_VectorSupportedTypes_TestRepeatCount16()
-        {
-            TestForType<ushort>();
-            TestForType<short>();
-        }
-
-        [TestCategory("HashCodeOfT")]
-        [TestMethod]
-        public void Test_HashCodeOfT_VectorSupportedTypes_TestRepeatCount32()
-        {
-            TestForType<uint>();
-            TestForType<int>();
-            TestForType<float>();
-        }
-
-        [TestCategory("HashCodeOfT")]
-        [TestMethod]
-        public void Test_HashCodeOfT_VectorSupportedTypes_TestRepeatCount64()
-        {
-            TestForType<ulong>();
-            TestForType<long>();
-            TestForType<double>();
-        }
-
-        [TestCategory("HashCodeOfT")]
-        [TestMethod]
-        public void Test_HashCodeOfT_VectorUnsupportedTypes_TestRepeat()
-        {
-            TestForType<char>();
-        }
-
-        /// <summary>
-        /// Performs a test for a specified type.
-        /// </summary>
-        /// <typeparam name="T">The type to test.</typeparam>
-        private static void TestForType<T>()
-            where T : unmanaged, IEquatable<T>
-        {
-            foreach (var count in TestCounts)
-            {
-                T[] data = CreateRandomData<T>(count);
-
-                HashCode hashCode1 = default;
-
-                hashCode1.Add<T>(data);
-
-                int hash1 = hashCode1.ToHashCode();
-
-                HashCode hashCode2 = default;
-
-                hashCode2.Add<T>(data);
-
-                int hash2 = hashCode2.ToHashCode();
-
-                int hash3 = HashCode<T>.Combine(data);
-
-                Assert.AreEqual(hash1, hash2, $"Failed {typeof(T)} test with count {count}: got {hash1} and then {hash2}");
-                Assert.AreEqual(hash1, hash3, $"Failed {typeof(T)} test with count {count}: got {hash1} and then {hash3}");
-            }
-        }
-
-        /// <summary>
-        /// Creates a random <typeparamref name="T"/> array filled with random data.
-        /// </summary>
-        /// <typeparam name="T">The type of items to put in the array.</typeparam>
-        /// <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)
-            where T : unmanaged
-        {
-            var random = new Random(count);
-
-            T[] data = new T[count];
-
-            foreach (ref byte n in MemoryMarshal.AsBytes(data.AsSpan()))
-            {
-                n = (byte)random.Next(0, byte.MaxValue);
-            }
-
-            return data;
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IBufferWriterExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IBufferWriterExtensions.cs
deleted file mode 100644
index 6ab9a809c5e..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IBufferWriterExtensions.cs
+++ /dev/null
@@ -1,129 +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;
-#if !WINDOWS_UWP
-using System.Buffers;
-#endif
-using System.IO;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.Toolkit.HighPerformance.Buffers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    public class Test_IBufferWriterExtensions
-    {
-        [TestCategory("IBufferWriterExtensions")]
-        [TestMethod]
-        public void Test_IBufferWriterExtensions_WriteReadOverBytes()
-        {
-            ArrayPoolBufferWriter<byte> writer = new ArrayPoolBufferWriter<byte>();
-
-            byte b = 255;
-            char c = '$';
-            float f = 3.14f;
-            double d = 6.28;
-            Guid guid = Guid.NewGuid();
-
-            writer.Write(b);
-            writer.Write(c);
-            writer.Write(f);
-            writer.Write(d);
-            writer.Write(guid);
-
-            int count = sizeof(byte) + sizeof(char) + sizeof(float) + sizeof(double) + Unsafe.SizeOf<Guid>();
-
-            Assert.AreEqual(count, writer.WrittenCount);
-
-            using Stream reader = writer.WrittenMemory.AsStream();
-
-            Assert.AreEqual(b, reader.Read<byte>());
-            Assert.AreEqual(c, reader.Read<char>());
-            Assert.AreEqual(f, reader.Read<float>());
-            Assert.AreEqual(d, reader.Read<double>());
-            Assert.AreEqual(guid, reader.Read<Guid>());
-        }
-
-        [TestCategory("IBufferWriterExtensions")]
-        [TestMethod]
-        public void Test_IBufferWriterExtensions_WriteReadItem_Guid()
-        {
-            Test_IBufferWriterExtensions_WriteReadItem(Guid.NewGuid(), Guid.NewGuid());
-        }
-
-        [TestCategory("IBufferWriterExtensions")]
-        [TestMethod]
-        public void Test_IBufferWriterExtensions_WriteReadItem_String()
-        {
-            Test_IBufferWriterExtensions_WriteReadItem("Hello", "World");
-        }
-
-        private static void Test_IBufferWriterExtensions_WriteReadItem<T>(T a, T b)
-            where T : IEquatable<T>
-        {
-            ArrayPoolBufferWriter<T> writer = new ArrayPoolBufferWriter<T>();
-
-            writer.Write(a);
-            writer.Write(b);
-
-            Assert.AreEqual(2, writer.WrittenCount);
-
-            ReadOnlySpan<T> span = writer.WrittenSpan;
-
-            Assert.AreEqual(a, span[0]);
-            Assert.AreEqual(b, span[1]);
-        }
-
-        [TestCategory("IBufferWriterExtensions")]
-        [TestMethod]
-        public void Test_IBufferWriterExtensions_WriteReadOverBytes_ReadOnlySpan()
-        {
-            int[] buffer = new int[128];
-
-            var random = new Random(42);
-
-            foreach (ref var n in buffer.AsSpan())
-            {
-                n = random.Next(int.MinValue, int.MaxValue);
-            }
-
-            ArrayPoolBufferWriter<byte> writer = new ArrayPoolBufferWriter<byte>();
-
-            writer.Write<int>(buffer);
-
-            Assert.AreEqual(sizeof(int) * buffer.Length, writer.WrittenCount);
-
-            ReadOnlySpan<byte> span = writer.WrittenSpan;
-
-            Assert.IsTrue(span.SequenceEqual(buffer.AsSpan().AsBytes()));
-        }
-
-        [TestCategory("IBufferWriterExtensions")]
-        [TestMethod]
-        public void Test_IBufferWriterExtensions_WriteReadOverItems_ReadOnlySpan()
-        {
-            int[] buffer = new int[128];
-
-            var random = new Random(42);
-
-            foreach (ref var n in buffer.AsSpan())
-            {
-                n = random.Next(int.MinValue, int.MaxValue);
-            }
-
-            ArrayPoolBufferWriter<int> writer = new ArrayPoolBufferWriter<int>();
-
-            writer.Write(buffer.AsSpan());
-
-            Assert.AreEqual(buffer.Length, writer.WrittenCount);
-
-            ReadOnlySpan<int> span = writer.WrittenSpan;
-
-            Assert.IsTrue(span.SequenceEqual(buffer.AsSpan()));
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IMemoryOwnerExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IMemoryOwnerExtensions.cs
deleted file mode 100644
index b0a665eee67..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_IMemoryOwnerExtensions.cs
+++ /dev/null
@@ -1,67 +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.IO;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.Toolkit.HighPerformance.Buffers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    public class Test_IMemoryOwnerExtensions
-    {
-        [TestCategory("IMemoryOwnerExtensions")]
-        [TestMethod]
-        public void Test_IMemoryOwnerExtensions_EmptyIMemoryOwnerStream()
-        {
-            MemoryOwner<byte> buffer = MemoryOwner<byte>.Empty;
-
-            Stream stream = buffer.AsStream();
-
-            Assert.IsNotNull(stream);
-            Assert.AreEqual(buffer.Length, 0);
-            Assert.AreEqual(stream.Length, 0);
-            Assert.IsTrue(stream.CanWrite);
-        }
-
-        [TestCategory("IMemoryOwnerExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_IMemoryOwnerStream()
-        {
-            MemoryOwner<byte> buffer = MemoryOwner<byte>.Allocate(1024);
-
-            Stream stream = buffer.AsStream();
-
-            Assert.IsNotNull(stream);
-            Assert.AreEqual(stream.Length, buffer.Length);
-            Assert.IsTrue(stream.CanWrite);
-        }
-
-        [TestCategory("IMemoryOwnerExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_IMemoryOwnerStream_DoesNotAlterExistingData()
-        {
-            MemoryOwner<byte> buffer = MemoryOwner<byte>.Allocate(1024);
-
-            // Fill the buffer with sample data
-            for (int i = 0; i < buffer.Length; i++)
-            {
-                buffer.Span[i] = unchecked((byte)(i & byte.MaxValue));
-            }
-
-            Stream stream = buffer.AsStream();
-
-            Assert.IsNotNull(stream);
-            Assert.AreEqual(stream.Length, buffer.Length);
-            Assert.IsTrue(stream.CanWrite);
-
-            // Validate that creating the stream doesn't alter the underlying buffer
-            for (int i = 0; i < buffer.Length; i++)
-            {
-                Assert.AreEqual(buffer.Span[i], unchecked((byte)(i & byte.MaxValue)));
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_MemoryExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_MemoryExtensions.cs
deleted file mode 100644
index 968476326dc..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_MemoryExtensions.cs
+++ /dev/null
@@ -1,635 +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.Buffers;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    public class Test_MemoryExtensions
-    {
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_Cast_Empty()
-        {
-            // Casting an empty memory of any size should always be valid
-            // and result in another empty memory, regardless of types.
-            Memory<byte> m1 = default;
-            Memory<byte> mc1 = m1.Cast<byte, byte>();
-
-            Assert.IsTrue(mc1.IsEmpty);
-
-            Memory<byte> m2 = default;
-            Memory<float> mc2 = m2.Cast<byte, float>();
-
-            Assert.IsTrue(mc2.IsEmpty);
-
-            Memory<short> m3 = default;
-            Memory<Guid> mc3 = m3.Cast<short, Guid>();
-
-            Assert.IsTrue(mc3.IsEmpty);
-
-            // Same as above, but with a sliced memory (length 12, slide from 12, so length of 0)
-            Memory<byte> m4 = new byte[12].AsMemory(12);
-            Memory<int> mc4 = m4.Cast<byte, int>();
-
-            Assert.IsTrue(mc4.IsEmpty);
-
-            // Same as above, but slicing to 12 in two steps
-            Memory<byte> m5 = new byte[12].AsMemory().Slice(4).Slice(8);
-            Memory<int> mc5 = m5.Cast<byte, int>();
-
-            Assert.IsTrue(mc5.IsEmpty);
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_Cast_TooShort()
-        {
-            // One int is 4 bytes, so casting from 3 rounds down to 0
-            Memory<byte> m1 = new byte[3];
-            Memory<int> mc1 = m1.Cast<byte, int>();
-
-            Assert.IsTrue(mc1.IsEmpty);
-
-            // Same as above, 13 / sizeof(int) == 3
-            Memory<byte> m2 = new byte[13];
-            Memory<float> mc2 = m2.Cast<byte, float>();
-
-            Assert.AreEqual(mc2.Length, 3);
-
-            // 16 - 5 = 11 ---> 11 / sizeof(int) = 2
-            Memory<byte> m3 = new byte[16].AsMemory(5);
-            Memory<float> mc3 = m3.Cast<byte, float>();
-
-            Assert.AreEqual(mc3.Length, 2);
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromArray_CastFromByte()
-        {
-            // Test for a standard cast from bytes with an evenly divisible length
-            Memory<byte> memoryOfBytes = new byte[128];
-            Memory<float> memoryOfFloats = memoryOfBytes.Cast<byte, float>();
-
-            Assert.AreEqual(memoryOfFloats.Length, 128 / sizeof(float));
-
-            Span<byte> spanOfBytes = memoryOfBytes.Span;
-            Span<float> spanOfFloats = memoryOfFloats.Span;
-
-            // We also need to check that the Span<T> returned from the caast memory
-            // actually has the initial reference pointing to the same location as
-            // the one to the same item in the span from the original memory.
-            Assert.AreEqual(memoryOfFloats.Length, spanOfFloats.Length);
-            Assert.IsTrue(Unsafe.AreSame(
-                ref spanOfBytes[0],
-                ref Unsafe.As<float, byte>(ref spanOfFloats[0])));
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromArray_CastToByte()
-        {
-            // Cast from float to bytes to verify casting works when the target type
-            // as a smaller byte size as well (so the resulting length will be larger).
-            Memory<float> memoryOfFloats = new float[128];
-            Memory<byte> memoryOfBytes = memoryOfFloats.Cast<float, byte>();
-
-            Assert.AreEqual(memoryOfBytes.Length, 128 * sizeof(float));
-
-            Span<float> spanOfFloats = memoryOfFloats.Span;
-            Span<byte> spanOfBytes = memoryOfBytes.Span;
-
-            // Same as above, we need to verify that the resulting span has matching
-            // starting references with the one produced by the original memory.
-            Assert.AreEqual(memoryOfBytes.Length, spanOfBytes.Length);
-            Assert.IsTrue(Unsafe.AreSame(
-                ref spanOfFloats[0],
-                ref Unsafe.As<byte, float>(ref spanOfBytes[0])));
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromArray_CastToShort()
-        {
-            // Similar test as above, just with different types to double check
-            Memory<float> memoryOfFloats = new float[128];
-            Memory<short> memoryOfShorts = memoryOfFloats.Cast<float, short>();
-
-            Assert.AreEqual(memoryOfShorts.Length, 128 * sizeof(float) / sizeof(short));
-
-            Span<float> spanOfFloats = memoryOfFloats.Span;
-            Span<short> spanOfShorts = memoryOfShorts.Span;
-
-            Assert.AreEqual(memoryOfShorts.Length, spanOfShorts.Length);
-            Assert.IsTrue(Unsafe.AreSame(
-                ref spanOfFloats[0],
-                ref Unsafe.As<short, float>(ref spanOfShorts[0])));
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromArray_CastFromByteAndBack()
-        {
-            // Here we start from a byte array, get a memory, then cast to float and then
-            // back to byte. We want to verify that the final memory is both valid and
-            // consistent, as well that our internal optimization works and that the final
-            // memory correctly skipped the indirect memory managed and just wrapped the original
-            // array instead. This is documented in the custom array memory manager in the package.
-            var data = new byte[128];
-            Memory<byte> memoryOfBytes = data;
-            Memory<float> memoryOfFloats = memoryOfBytes.Cast<byte, float>();
-            Memory<byte> memoryBack = memoryOfFloats.Cast<float, byte>();
-
-            Assert.AreEqual(memoryOfBytes.Length, memoryBack.Length);
-
-            // Here we get the array from the final memory and check that it does exist and
-            // the associated parameters match the ones we'd expect here (same length, offset of 0).
-            Assert.IsTrue(MemoryMarshal.TryGetArray<byte>(memoryBack, out var segment));
-            Assert.AreSame(segment.Array!, data);
-            Assert.AreEqual(segment.Offset, 0);
-            Assert.AreEqual(segment.Count, data.Length);
-
-            Assert.IsTrue(memoryOfBytes.Equals(memoryBack));
-
-            Span<byte> span1 = memoryOfBytes.Span;
-            Span<byte> span2 = memoryBack.Span;
-
-            // Also validate the initial and final spans for reference equality
-            Assert.IsTrue(span1 == span2);
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_Cast_TooShort_WithSlice()
-        {
-            // Like we did above, we have some more tests where we slice an initial memory and
-            // validate the length of the resulting, accounting for the expected rounding down.
-            Memory<byte> m1 = new byte[8].AsMemory().Slice(4, 3);
-            Memory<int> mc1 = m1.Cast<byte, int>();
-
-            Assert.IsTrue(mc1.IsEmpty);
-
-            Memory<byte> m2 = new byte[20].AsMemory().Slice(4, 13);
-            Memory<float> mc2 = m2.Cast<byte, float>();
-
-            Assert.AreEqual(mc2.Length, 3);
-
-            Memory<byte> m3 = new byte[16].AsMemory().Slice(5);
-            Memory<float> mc3 = m3.Cast<byte, float>();
-
-            Assert.AreEqual(mc3.Length, 2);
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromArray_CastFromByte_WithSlice()
-        {
-            // Same exact test as the cast from byte to float did above, but with a slice. This is done
-            // to ensure the cast still works correctly when the memory is internally storing an offset.
-            Memory<byte> memoryOfBytes = new byte[512].AsMemory().Slice(128, 128);
-            Memory<float> memoryOfFloats = memoryOfBytes.Cast<byte, float>();
-
-            Assert.AreEqual(memoryOfFloats.Length, 128 / sizeof(float));
-
-            Span<byte> spanOfBytes = memoryOfBytes.Span;
-            Span<float> spanOfFloats = memoryOfFloats.Span;
-
-            Assert.AreEqual(memoryOfFloats.Length, spanOfFloats.Length);
-            Assert.IsTrue(Unsafe.AreSame(
-                ref spanOfBytes[0],
-                ref Unsafe.As<float, byte>(ref spanOfFloats[0])));
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromArray_CastToByte_WithSlice()
-        {
-            // Same as above, just with inverted source and destination types
-            Memory<float> memoryOfFloats = new float[512].AsMemory().Slice(128, 128);
-            Memory<byte> memoryOfBytes = memoryOfFloats.Cast<float, byte>();
-
-            Assert.AreEqual(memoryOfBytes.Length, 128 * sizeof(float));
-
-            Span<float> spanOfFloats = memoryOfFloats.Span;
-            Span<byte> spanOfBytes = memoryOfBytes.Span;
-
-            Assert.AreEqual(memoryOfBytes.Length, spanOfBytes.Length);
-            Assert.IsTrue(Unsafe.AreSame(
-                ref spanOfFloats[0],
-                ref Unsafe.As<byte, float>(ref spanOfBytes[0])));
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromArray_CastToShort_WithSlice()
-        {
-            // Once again the same test but with types both different in size than 1. We're mostly
-            // just testing the rounding logic in a number of different case to ensure it's correct.
-            Memory<float> memoryOfFloats = new float[512].AsMemory().Slice(128, 128);
-            Memory<short> memoryOfShorts = memoryOfFloats.Cast<float, short>();
-
-            Assert.AreEqual(memoryOfShorts.Length, 128 * sizeof(float) / sizeof(short));
-
-            Span<float> spanOfFloats = memoryOfFloats.Span;
-            Span<short> spanOfShorts = memoryOfShorts.Span;
-
-            Assert.AreEqual(memoryOfShorts.Length, spanOfShorts.Length);
-            Assert.IsTrue(Unsafe.AreSame(
-                ref spanOfFloats[0],
-                ref Unsafe.As<short, float>(ref spanOfShorts[0])));
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromArray_CastFromByteAndBack_WithSlice()
-        {
-            // Just like the equivalent test above, but with a slice thrown in too
-            var data = new byte[512];
-            Memory<byte> memoryOfBytes = data.AsMemory().Slice(128, 128);
-            Memory<float> memoryOfFloats = memoryOfBytes.Cast<byte, float>();
-            Memory<byte> memoryBack = memoryOfFloats.Cast<float, byte>();
-
-            Assert.AreEqual(memoryOfBytes.Length, memoryBack.Length);
-
-            // Here we now also have to validate the starting offset from the extracted array
-            Assert.IsTrue(MemoryMarshal.TryGetArray<byte>(memoryBack, out var segment));
-            Assert.AreSame(segment.Array!, data);
-            Assert.AreEqual(segment.Offset, 128);
-            Assert.AreEqual(segment.Count, 128);
-
-            Assert.IsTrue(memoryOfBytes.Equals(memoryBack));
-
-            Span<byte> span1 = memoryOfBytes.Span;
-            Span<byte> span2 = memoryBack.Span;
-
-            Assert.IsTrue(span1 == span2);
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromMemoryManager_CastFromByte()
-        {
-            // This test is just like the ones above, but this time we're casting a memory
-            // that wraps a custom memory manager and not an array. This is done to ensure
-            // the casting logic works correctly in all cases, as it'll use a different
-            // memory manager internally (a memory can wrap a string, an array or a manager).
-            Memory<byte> memoryOfBytes = new ArrayMemoryManager<byte>(128);
-            Memory<float> memoryOfFloats = memoryOfBytes.Cast<byte, float>();
-
-            Assert.AreEqual(memoryOfFloats.Length, 128 / sizeof(float));
-
-            Span<byte> spanOfBytes = memoryOfBytes.Span;
-            Span<float> spanOfFloats = memoryOfFloats.Span;
-
-            Assert.AreEqual(memoryOfFloats.Length, spanOfFloats.Length);
-            Assert.IsTrue(Unsafe.AreSame(
-                ref spanOfBytes[0],
-                ref Unsafe.As<float, byte>(ref spanOfFloats[0])));
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromMemoryManager_CastToByte()
-        {
-            // Same as above, but with inverted types
-            Memory<float> memoryOfFloats = new ArrayMemoryManager<float>(128);
-            Memory<byte> memoryOfBytes = memoryOfFloats.Cast<float, byte>();
-
-            Assert.AreEqual(memoryOfBytes.Length, 128 * sizeof(float));
-
-            Span<float> spanOfFloats = memoryOfFloats.Span;
-            Span<byte> spanOfBytes = memoryOfBytes.Span;
-
-            Assert.AreEqual(memoryOfBytes.Length, spanOfBytes.Length);
-            Assert.IsTrue(Unsafe.AreSame(
-                ref spanOfFloats[0],
-                ref Unsafe.As<byte, float>(ref spanOfBytes[0])));
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromMemoryManager_CastToShort()
-        {
-            // Same as above, but with types different in size than 1, just in case
-            Memory<float> memoryOfFloats = new ArrayMemoryManager<float>(128);
-            Memory<short> memoryOfShorts = memoryOfFloats.Cast<float, short>();
-
-            Assert.AreEqual(memoryOfShorts.Length, 128 * sizeof(float) / sizeof(short));
-
-            Span<float> spanOfFloats = memoryOfFloats.Span;
-            Span<short> spanOfShorts = memoryOfShorts.Span;
-
-            Assert.AreEqual(memoryOfShorts.Length, spanOfShorts.Length);
-            Assert.IsTrue(Unsafe.AreSame(
-                ref spanOfFloats[0],
-                ref Unsafe.As<short, float>(ref spanOfShorts[0])));
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromMemoryManager_CastFromByteAndBack()
-        {
-            // Equivalent to the one with an array, but with a memory manager
-            var data = new ArrayMemoryManager<byte>(128);
-            Memory<byte> memoryOfBytes = data;
-            Memory<float> memoryOfFloats = memoryOfBytes.Cast<byte, float>();
-            Memory<byte> memoryBack = memoryOfFloats.Cast<float, byte>();
-
-            Assert.AreEqual(memoryOfBytes.Length, memoryBack.Length);
-
-            // Here we expect to get back the original memory manager, due to the same optimization we
-            // checked for when using an array. We need to check they're the same, and the other parameters.
-            Assert.IsTrue(MemoryMarshal.TryGetMemoryManager<byte, ArrayMemoryManager<byte>>(memoryBack, out var manager, out var start, out var length));
-            Assert.AreSame(manager!, data);
-            Assert.AreEqual(start, 0);
-            Assert.AreEqual(length, 128);
-
-            Assert.IsTrue(memoryOfBytes.Equals(memoryBack));
-
-            Span<byte> span1 = memoryOfBytes.Span;
-            Span<byte> span2 = memoryBack.Span;
-
-            Assert.IsTrue(span1 == span2);
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromMemoryManager_CastFromByte_WithSlice()
-        {
-            // Same as the ones with an array, but with an extra slice
-            Memory<byte> memoryOfBytes = new ArrayMemoryManager<byte>(512).Memory.Slice(128, 128);
-            Memory<float> memoryOfFloats = memoryOfBytes.Cast<byte, float>();
-
-            Assert.AreEqual(memoryOfFloats.Length, 128 / sizeof(float));
-
-            Span<byte> spanOfBytes = memoryOfBytes.Span;
-            Span<float> spanOfFloats = memoryOfFloats.Span;
-
-            Assert.AreEqual(memoryOfFloats.Length, spanOfFloats.Length);
-            Assert.IsTrue(Unsafe.AreSame(
-                ref spanOfBytes[0],
-                ref Unsafe.As<float, byte>(ref spanOfFloats[0])));
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromMemoryManager_CastToByte_WithSlice()
-        {
-            // Same as above, but with inverted types
-            Memory<float> memoryOfFloats = new ArrayMemoryManager<float>(512).Memory.Slice(128, 128);
-            Memory<byte> memoryOfBytes = memoryOfFloats.Cast<float, byte>();
-
-            Assert.AreEqual(memoryOfBytes.Length, 128 * sizeof(float));
-
-            Span<float> spanOfFloats = memoryOfFloats.Span;
-            Span<byte> spanOfBytes = memoryOfBytes.Span;
-
-            Assert.AreEqual(memoryOfBytes.Length, spanOfBytes.Length);
-            Assert.IsTrue(Unsafe.AreSame(
-                ref spanOfFloats[0],
-                ref Unsafe.As<byte, float>(ref spanOfBytes[0])));
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromMemoryManager_CastToShort_WithSlice()
-        {
-            // Same as above but with different types
-            Memory<float> memoryOfFloats = new ArrayMemoryManager<float>(512).Memory.Slice(128, 128);
-            Memory<short> memoryOfShorts = memoryOfFloats.Cast<float, short>();
-
-            Assert.AreEqual(memoryOfShorts.Length, 128 * sizeof(float) / sizeof(short));
-
-            Span<float> spanOfFloats = memoryOfFloats.Span;
-            Span<short> spanOfShorts = memoryOfShorts.Span;
-
-            Assert.AreEqual(memoryOfShorts.Length, spanOfShorts.Length);
-            Assert.IsTrue(Unsafe.AreSame(
-                ref spanOfFloats[0],
-                ref Unsafe.As<short, float>(ref spanOfShorts[0])));
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromMemoryManager_CastFromByteAndBack_WithSlice()
-        {
-            // Just like the one above, but with the slice
-            var data = new ArrayMemoryManager<byte>(512);
-            Memory<byte> memoryOfBytes = data.Memory.Slice(128, 128);
-            Memory<float> memoryOfFloats = memoryOfBytes.Cast<byte, float>();
-            Memory<byte> memoryBack = memoryOfFloats.Cast<float, byte>();
-
-            Assert.AreEqual(memoryOfBytes.Length, memoryBack.Length);
-
-            // Here we also need to validate that the offset was maintained
-            Assert.IsTrue(MemoryMarshal.TryGetMemoryManager<byte, ArrayMemoryManager<byte>>(memoryBack, out var manager, out var start, out var length));
-            Assert.AreSame(manager!, data);
-            Assert.AreEqual(start, 128);
-            Assert.AreEqual(length, 128);
-
-            Assert.IsTrue(memoryOfBytes.Equals(memoryBack));
-
-            Span<byte> span1 = memoryOfBytes.Span;
-            Span<byte> span2 = memoryBack.Span;
-
-            Assert.IsTrue(span1 == span2);
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        [DataRow(64, 0, 0)]
-        [DataRow(64, 4, 0)]
-        [DataRow(64, 0, 4)]
-        [DataRow(64, 4, 4)]
-        [DataRow(64, 4, 0)]
-        [DataRow(256, 16, 0)]
-        [DataRow(256, 4, 16)]
-        [DataRow(256, 64, 0)]
-        [DataRow(256, 64, 8)]
-        public unsafe void Test_MemoryExtensions_FromArray_CastFromByte_Pin(int size, int preOffset, int postOffset)
-        {
-            // Here we need to validate that pinning works correctly in a number of cases. First we allocate
-            // an array of the requested size, then get a memory after slicing to a target position, then cast
-            // and then slice again. We do so to ensure that pinning correctly tracks the correct index with
-            // respect to the original array through a number of internal offsets. As in, when pinning the
-            // final memory, our internal custom memory manager should be able to pin the item in the original
-            // array at offset preOffset + (postOffset * sizeof(float)), accounting for the cast as well.
-            var data = new byte[size];
-            Memory<byte> memoryOfBytes = data.AsMemory(preOffset);
-            Memory<float> memoryOfFloats = memoryOfBytes.Cast<byte, float>().Slice(postOffset);
-
-            using var handle = memoryOfFloats.Pin();
-
-            void* p1 = handle.Pointer;
-            void* p2 = Unsafe.AsPointer(ref data[preOffset + (postOffset * sizeof(float))]);
-
-            Assert.IsTrue(p1 == p2);
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        [DataRow(64, 0, 0)]
-        [DataRow(64, 4, 0)]
-        [DataRow(64, 0, 4)]
-        [DataRow(64, 4, 4)]
-        [DataRow(64, 4, 0)]
-        [DataRow(256, 16, 0)]
-        [DataRow(256, 4, 16)]
-        [DataRow(256, 64, 0)]
-        [DataRow(256, 64, 8)]
-        public unsafe void Test_MemoryExtensions_FromMemoryManager_CastFromByte_Pin(int size, int preOffset, int postOffset)
-        {
-            // Just like the test above, but this type the initial memory wraps a memory manager
-            var data = new ArrayMemoryManager<byte>(size);
-            Memory<byte> memoryOfBytes = data.Memory.Slice(preOffset);
-            Memory<float> memoryOfFloats = memoryOfBytes.Cast<byte, float>().Slice(postOffset);
-
-            using var handle = memoryOfFloats.Pin();
-
-            void* p1 = handle.Pointer;
-            void* p2 = Unsafe.AsPointer(ref data.GetSpan()[preOffset + (postOffset * sizeof(float))]);
-
-            Assert.IsTrue(p1 == p2);
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_FromString_CastFromByteAndBack()
-        {
-            // This is the same as the tests above, but here we're testing the
-            // other remaining case, that is when a memory is wrapping a string.
-            var data = new string('a', 128);
-            Memory<char> memoryOfChars = MemoryMarshal.AsMemory(data.AsMemory());
-            Memory<float> memoryOfFloats = memoryOfChars.Cast<char, float>();
-            Memory<char> memoryBack = memoryOfFloats.Cast<float, char>();
-
-            Assert.AreEqual(memoryOfChars.Length, memoryBack.Length);
-
-            // Get the original string back (to validate the optimization too) and check the params
-            Assert.IsTrue(MemoryMarshal.TryGetString(memoryOfChars, out var text, out int start, out int length));
-            Assert.AreSame(text!, data);
-            Assert.AreEqual(start, 0);
-            Assert.AreEqual(length, data.Length);
-
-            Assert.IsTrue(memoryOfChars.Equals(memoryBack));
-
-            Span<char> span1 = memoryOfChars.Span;
-            Span<char> span2 = memoryBack.Span;
-
-            Assert.IsTrue(span1 == span2);
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        [DataRow(64, 0, 0)]
-        [DataRow(64, 4, 0)]
-        [DataRow(64, 0, 4)]
-        [DataRow(64, 4, 4)]
-        [DataRow(64, 4, 0)]
-        [DataRow(256, 16, 0)]
-        [DataRow(256, 4, 16)]
-        [DataRow(256, 64, 0)]
-        [DataRow(256, 64, 8)]
-        public unsafe void Test_MemoryExtensions_FromString_CastAndPin(int size, int preOffset, int postOffset)
-        {
-            // Same test as before to validate pinning, but starting from a string
-            var data = new string('a', size);
-            Memory<char> memoryOfChars = MemoryMarshal.AsMemory(data.AsMemory()).Slice(preOffset);
-            Memory<byte> memoryOfBytes = memoryOfChars.Cast<char, byte>().Slice(postOffset);
-
-            using (var handle1 = memoryOfBytes.Pin())
-            {
-                void* p1 = handle1.Pointer;
-                void* p2 = Unsafe.AsPointer(ref data.DangerousGetReferenceAt(preOffset + (postOffset * sizeof(byte) / sizeof(char))));
-
-                Assert.IsTrue(p1 == p2);
-            }
-
-            // Here we also add an extra test just like the one above, but casting to a type
-            // that is bigger in byte size than char. Just to double check the casting logic.
-            Memory<int> memoryOfInts = memoryOfChars.Cast<char, int>().Slice(postOffset);
-
-            using (var handle2 = memoryOfInts.Pin())
-            {
-                void* p3 = handle2.Pointer;
-                void* p4 = Unsafe.AsPointer(ref data.DangerousGetReferenceAt(preOffset + (postOffset * sizeof(int) / sizeof(char))));
-
-                Assert.IsTrue(p3 == p4);
-            }
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_EmptyMemoryStream()
-        {
-            Memory<byte> memory = default;
-
-            // Creating a stream from a default memory is valid, it's just empty
-            Stream stream = memory.AsStream();
-
-            Assert.IsNotNull(stream);
-            Assert.AreEqual(stream.Length, memory.Length);
-            Assert.IsTrue(stream.CanWrite);
-        }
-
-        [TestCategory("MemoryExtensions")]
-        [TestMethod]
-        public void Test_MemoryExtensions_MemoryStream()
-        {
-            Memory<byte> memory = new byte[1024];
-
-            Stream stream = memory.AsStream();
-
-            Assert.IsNotNull(stream);
-            Assert.AreEqual(stream.Length, memory.Length);
-            Assert.IsTrue(stream.CanWrite);
-        }
-
-        private sealed class ArrayMemoryManager<T> : MemoryManager<T>
-            where T : unmanaged
-        {
-            private readonly T[] array;
-
-            public ArrayMemoryManager(int size)
-            {
-                this.array = new T[size];
-            }
-
-            public override Span<T> GetSpan()
-            {
-                return this.array;
-            }
-
-            public override unsafe MemoryHandle Pin(int elementIndex = 0)
-            {
-                GCHandle handle = GCHandle.Alloc(this.array, GCHandleType.Pinned);
-                ref T r0 = ref this.array[elementIndex];
-                void* p = Unsafe.AsPointer(ref r0);
-
-                return new MemoryHandle(p, handle);
-            }
-
-            public override void Unpin()
-            {
-            }
-
-            protected override void Dispose(bool disposing)
-            {
-            }
-
-            public static implicit operator Memory<T>(ArrayMemoryManager<T> memoryManager)
-            {
-                return memoryManager.Memory;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_NullableExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_NullableExtensions.cs
deleted file mode 100644
index 4ccf1773405..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_NullableExtensions.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.
-
-#if NET5_0
-
-using System.Numerics;
-using Microsoft.Toolkit.HighPerformance.Extensions;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    public class Test_NullableExtensions
-    {
-        [TestCategory("NullableExtensions")]
-        [TestMethod]
-        public void Test_NullableExtensions_DangerousGetReference()
-        {
-            static void Test<T>(T before, T after)
-                where T : struct
-            {
-                T? nullable = before;
-                ref T reference = ref nullable.DangerousGetValueOrDefaultReference();
-
-                Assert.AreEqual(nullable.Value, before);
-
-                reference = after;
-
-                Assert.AreEqual(nullable.Value, after);
-            }
-
-            Test(0, 42);
-            Test(1.3f, 3.14f);
-            Test(0.555, 8.49);
-            Test(Vector4.Zero, new Vector4(1, 5.55f, 2, 3.14f));
-            Test(Matrix4x4.Identity, Matrix4x4.CreateOrthographic(35, 88.34f, 9.99f, 24.6f));
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlyMemoryExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlyMemoryExtensions.cs
deleted file mode 100644
index 17618ce5dce..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlyMemoryExtensions.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.IO;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    public class Test_ReadOnlyMemoryExtensions
-    {
-        [TestCategory("ReadOnlyMemoryExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlyMemoryExtensions_EmptyMemoryStream()
-        {
-            ReadOnlyMemory<byte> memory = default;
-
-            Stream stream = memory.AsStream();
-
-            Assert.IsNotNull(stream);
-            Assert.AreEqual(stream.Length, memory.Length);
-            Assert.IsFalse(stream.CanWrite);
-        }
-
-        [TestCategory("ReadOnlyMemoryExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlyMemoryExtensions_MemoryStream()
-        {
-            ReadOnlyMemory<byte> memory = new byte[1024];
-
-            Stream stream = memory.AsStream();
-
-            Assert.IsNotNull(stream);
-            Assert.AreEqual(stream.Length, memory.Length);
-            Assert.IsFalse(stream.CanWrite);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
deleted file mode 100644
index b653079f8db..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.Count.cs
+++ /dev/null
@@ -1,264 +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.CodeAnalysis;
-using System.Diagnostics.Contracts;
-using System.Linq;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using UnitTests.HighPerformance.Shared.Buffers.Internals;
-
-#nullable enable
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    public partial class Test_ReadOnlySpanExtensions
-    {
-        /// <summary>
-        /// Gets the list of counts to test the extension for
-        /// </summary>
-        private static ReadOnlySpan<int> TestCounts => new[] { 0, 1, 7, 128, 255, 256, short.MaxValue, short.MaxValue + 1, 123_938, 1_678_922, 71_890_819 };
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_RandomCount8()
-        {
-            TestForType((byte)123, CreateRandomData);
-            TestForType((sbyte)123, CreateRandomData);
-            TestForType(true, CreateRandomData);
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_RandomCount16()
-        {
-            TestForType((ushort)4712, CreateRandomData);
-            TestForType((short)4712, CreateRandomData);
-            TestForType((char)4712, CreateRandomData);
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        [SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1139", Justification = "Easier to tell types apart at a glance")]
-        public void Test_ReadOnlySpanExtensions_RandomCount32()
-        {
-            TestForType((int)37438941, CreateRandomData);
-            TestForType((uint)37438941, CreateRandomData);
-            TestForType(MathF.PI, CreateRandomData);
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        [SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1139", Justification = "Easier to tell types apart at a glance")]
-        public void Test_ReadOnlySpanExtensions_RandomCount64()
-        {
-            TestForType((long)47128480128401, CreateRandomData);
-            TestForType((ulong)47128480128401, CreateRandomData);
-            TestForType(Math.PI, CreateRandomData);
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_RandomCountManaged()
-        {
-            var value = new Int(37438941);
-
-            // We can skip the most expensive test in this case, as we're not testing
-            // a SIMD enabled path. The last test requires a very high memory usage which
-            // sometimes causes the CI test runner to fail with an out of memory exception.
-            // Since we don't need to double check overflows in the managed case, which is
-            // just a classic linear loop with some optimizations, omitting this case is fine.
-            foreach (var count in TestCounts.Slice(0, TestCounts.Length - 1))
-            {
-                var random = new Random(count);
-
-                Int[] data = new Int[count];
-
-                foreach (ref Int item in data.AsSpan())
-                {
-                    item = new Int(random.Next());
-                }
-
-                // Fill at least 20% of the items with a matching value
-                int minimum = count / 20;
-
-                for (int i = 0; i < minimum; i++)
-                {
-                    data[random.Next(0, count)] = value;
-                }
-
-                int result = data.Count(value);
-                int expected = CountWithForeach(data, value);
-
-                Assert.AreEqual(result, expected, $"Failed {typeof(Int)} test with count {count}: got {result} instead of {expected}");
-            }
-        }
-
-        // Dummy type to test the managed code path of the API
-        private sealed class Int : IEquatable<Int>
-        {
-            private int Value { get; }
-
-            public Int(int value) => Value = value;
-
-            public bool Equals(Int? other)
-            {
-                if (other is null)
-                {
-                    return false;
-                }
-
-                if (ReferenceEquals(this, other))
-                {
-                    return true;
-                }
-
-                return this.Value == other.Value;
-            }
-
-            public override bool Equals(object? obj)
-            {
-                return ReferenceEquals(this, obj) || (obj is Int other && Equals(other));
-            }
-
-            public override int GetHashCode()
-            {
-                return this.Value;
-            }
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_FilledCount8()
-        {
-            TestForType((byte)123, (count, _) => CreateFilledData(count, (byte)123));
-            TestForType((sbyte)123, (count, _) => CreateFilledData(count, (sbyte)123));
-            TestForType(true, (count, _) => CreateFilledData(count, true));
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_FilledCount16()
-        {
-            TestForType((ushort)4712, (count, _) => CreateFilledData(count, (ushort)4712));
-            TestForType((short)4712, (count, _) => CreateFilledData(count, (short)4712));
-            TestForType((char)4712, (count, _) => CreateFilledData(count, (char)4712));
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        [SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1139", Justification = "Easier to tell types apart at a glance")]
-        public void Test_ReadOnlySpanExtensions_FilledCount32()
-        {
-            TestForType((int)37438941, (count, _) => CreateFilledData(count, (int)37438941));
-            TestForType((uint)37438941, (count, _) => CreateFilledData(count, (uint)37438941));
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        [SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1139", Justification = "Easier to tell types apart at a glance")]
-        public void Test_ReadOnlySpanExtensions_FilledCount64()
-        {
-            TestForType((long)47128480128401, (count, _) => CreateFilledData(count, (long)47128480128401));
-            TestForType((ulong)47128480128401, (count, _) => CreateFilledData(count, (ulong)47128480128401));
-        }
-
-        /// <summary>
-        /// Performs a test for a specified type.
-        /// </summary>
-        /// <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, UnmanagedSpanOwner<T>> provider)
-            where T : unmanaged, IEquatable<T>
-        {
-            foreach (var count in TestCounts)
-            {
-                using UnmanagedSpanOwner<T> data = provider(count, 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}");
-            }
-        }
-
-        /// <summary>
-        /// Counts the number of occurrences of a given value into a target <see cref="ReadOnlySpan{T}"/> instance.
-        /// </summary>
-        /// <typeparam name="T">The type of items to count.</typeparam>
-        /// <param name="span">The input <see cref="ReadOnlySpan{T}"/> instance to read.</param>
-        /// <param name="value">The value to look for.</param>
-        /// <returns>The number of occurrences of <paramref name="value"/> in <paramref name="span"/>.</returns>
-        [Pure]
-        private static int CountWithForeach<T>(ReadOnlySpan<T> span, T value)
-            where T : IEquatable<T>
-        {
-            int count = 0;
-
-            foreach (var item in span)
-            {
-                if (item.Equals(value))
-                {
-                    count++;
-                }
-            }
-
-            return count;
-        }
-
-        /// <summary>
-        /// Creates a random <typeparamref name="T"/> array filled with random data.
-        /// </summary>
-        /// <typeparam name="T">The type of items to put in the array.</typeparam>
-        /// <param name="count">The number of array items to create.</param>
-        /// <param name="value">The value to look for.</param>
-        /// <returns>An array of random <typeparamref name="T"/> elements.</returns>
-        [Pure]
-        private static UnmanagedSpanOwner<T> CreateRandomData<T>(int count, T value)
-            where T : unmanaged
-        {
-            var random = new Random(count);
-
-            UnmanagedSpanOwner<T> data = new UnmanagedSpanOwner<T>(count);
-
-            foreach (ref byte n in MemoryMarshal.AsBytes(data.GetSpan()))
-            {
-                n = (byte)random.Next(0, byte.MaxValue);
-            }
-
-            // Fill at least 20% of the items with a matching value
-            int minimum = count / 20;
-
-            Span<T> span = data.GetSpan();
-
-            for (int i = 0; i < minimum; i++)
-            {
-                span[random.Next(0, count)] = value;
-            }
-
-            return data;
-        }
-
-        /// <summary>
-        /// Creates a <typeparamref name="T"/> array filled with a given value.
-        /// </summary>
-        /// <typeparam name="T">The type of items to put in the array.</typeparam>
-        /// <param name="count">The number of array items to create.</param>
-        /// <param name="value">The value to use to populate the array.</param>
-        /// <returns>An array of <typeparamref name="T"/> elements.</returns>
-        [Pure]
-        private static UnmanagedSpanOwner<T> CreateFilledData<T>(int count, T value)
-            where T : unmanaged
-        {
-            UnmanagedSpanOwner<T> data = new UnmanagedSpanOwner<T>(count);
-
-            data.GetSpan().Fill(value);
-
-            return data;
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs
deleted file mode 100644
index 9cacdd005c2..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_ReadOnlySpanExtensions.cs
+++ /dev/null
@@ -1,315 +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.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1601", Justification = "Partial test class")]
-    public partial class Test_ReadOnlySpanExtensions
-    {
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_DangerousGetReference()
-        {
-            using var owner = CreateRandomData<int>(12, default);
-
-            ReadOnlySpan<int> data = owner.GetSpan();
-
-            ref int r0 = ref data.DangerousGetReference();
-            ref int r1 = ref Unsafe.AsRef(data[0]);
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_DangerousGetReferenceAt_Zero()
-        {
-            using var owner = CreateRandomData<int>(12, default);
-
-            ReadOnlySpan<int> data = owner.GetSpan();
-
-            ref int r0 = ref data.DangerousGetReference();
-            ref int r1 = ref data.DangerousGetReferenceAt(0);
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_DangerousGetReferenceAt_Index()
-        {
-            using var owner = CreateRandomData<int>(12, default);
-
-            ReadOnlySpan<int> data = owner.GetSpan();
-
-            ref int r0 = ref data.DangerousGetReferenceAt(5);
-            ref int r1 = ref Unsafe.AsRef(data[5]);
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        [DataRow(0)]
-        [DataRow(4)]
-        [DataRow(22)]
-        [DataRow(43)]
-        [DataRow(44)]
-        [DataRow(45)]
-        [DataRow(46)]
-        [DataRow(100)]
-        [DataRow(int.MaxValue)]
-        [DataRow(-1)]
-        [DataRow(int.MinValue)]
-        public void Test_ReadOnlySpanExtensions_DangerousGetLookupReferenceAt(int i)
-        {
-            ReadOnlySpan<byte> table = new byte[]
-            {
-                0xFF, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 1, 1, 0, 1, 1, 1, 1,
-                0, 1, 0, 1, 0, 1, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 1, 0, 1
-            };
-
-            ref byte ri = ref Unsafe.AsRef(table.DangerousGetLookupReferenceAt(i));
-
-            bool isInRange = (uint)i < (uint)table.Length;
-
-            if (isInRange)
-            {
-                Assert.IsTrue(Unsafe.AreSame(ref ri, ref Unsafe.AsRef(table[i])));
-            }
-            else
-            {
-                Assert.IsTrue(Unsafe.AreSame(ref ri, ref MemoryMarshal.GetReference(table)));
-            }
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_IndexOf_Empty()
-        {
-            static void Test<T>()
-            {
-                Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
-                {
-                    T a = default;
-
-                    default(ReadOnlySpan<T>).IndexOf(in a);
-                });
-
-                Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
-                {
-                    ReadOnlySpan<T> data = new T[] { default };
-
-                    data.Slice(1).IndexOf(in data[0]);
-                });
-            }
-
-            Test<byte>();
-            Test<int>();
-            Test<Guid>();
-            Test<string>();
-            Test<object>();
-            Test<IEnumerable<int>>();
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_IndexOf_NotEmpty()
-        {
-            static void Test<T>()
-            {
-                ReadOnlySpan<T> data = new T[] { default, default, default, default };
-
-                for (int i = 0; i < data.Length; i++)
-                {
-                    Assert.AreEqual(i, data.IndexOf(in data[i]));
-                }
-            }
-
-            Test<byte>();
-            Test<int>();
-            Test<Guid>();
-            Test<string>();
-            Test<object>();
-            Test<IEnumerable<int>>();
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_IndexOf_NotEmpty_OutOfRange()
-        {
-            static void Test<T>()
-            {
-                // Before start
-                Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
-                {
-                    ReadOnlySpan<T> data = new T[] { default, default, default, default };
-
-                    data.Slice(1).IndexOf(in data[0]);
-                });
-
-                // After end
-                Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
-                {
-                    ReadOnlySpan<T> data = new T[] { default, default, default, default };
-
-                    data.Slice(0, 2).IndexOf(in data[2]);
-                });
-
-                // Local variable
-                Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
-                {
-                    var dummy = new T[] { default };
-                    ReadOnlySpan<T> data = new T[] { default, default, default, default };
-
-                    data.IndexOf(in dummy[0]);
-                });
-            }
-
-            Test<byte>();
-            Test<int>();
-            Test<Guid>();
-            Test<string>();
-            Test<object>();
-            Test<IEnumerable<int>>();
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_Enumerate()
-        {
-            ReadOnlySpan<int> data = new[] { 1, 2, 3, 4, 5, 6, 7 };
-
-            int i = 0;
-
-            foreach (var item in data.Enumerate())
-            {
-                Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(data[i]), ref Unsafe.AsRef(item.Value)));
-                Assert.AreEqual(i, item.Index);
-
-                i++;
-            }
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_Enumerate_Empty()
-        {
-            ReadOnlySpan<int> data = Array.Empty<int>();
-
-            foreach (var item in data.Enumerate())
-            {
-                Assert.Fail("Empty source sequence");
-            }
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_Tokenize_Empty()
-        {
-            string text = string.Empty;
-
-            var result = new List<string>();
-
-            foreach (var token in text.AsSpan().Tokenize(','))
-            {
-                result.Add(new string(token.ToArray()));
-            }
-
-            var tokens = text.Split(',');
-
-            CollectionAssert.AreEqual(result, tokens);
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_Tokenize_Comma()
-        {
-            string text = "name,surname,city,year,profession,age";
-
-            var result = new List<string>();
-
-            foreach (var token in text.AsSpan().Tokenize(','))
-            {
-                result.Add(new string(token.ToArray()));
-            }
-
-            var tokens = text.Split(',');
-
-            CollectionAssert.AreEqual(result, tokens);
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_Tokenize_CommaWithMissingValues()
-        {
-            string text = ",name,,city,,,profession,,age,,";
-
-            var result = new List<string>();
-
-            foreach (var token in text.AsSpan().Tokenize(','))
-            {
-                result.Add(new string(token.ToArray()));
-            }
-
-            var tokens = text.Split(',');
-
-            CollectionAssert.AreEqual(result, tokens);
-        }
-
-        [TestCategory("ReadOnlySpanExtensions")]
-        [TestMethod]
-        public void Test_ReadOnlySpanExtensions_CopyTo_RefEnumerable()
-        {
-            int[,] array = new int[4, 5];
-
-            ReadOnlySpan<int>
-                values1 = new[] { 10, 20, 30, 40, 50 },
-                values2 = new[] { 11, 22, 33, 44, 55 };
-
-            // Copy a span to a target row and column with valid lengths
-            values1.CopyTo(array.GetRow(0));
-            values2.Slice(0, 4).CopyTo(array.GetColumn(1));
-
-            int[,] result =
-            {
-                { 10, 11, 30, 40, 50 },
-                { 0, 22, 0, 0, 0 },
-                { 0, 33, 0, 0, 0 },
-                { 0, 44, 0, 0, 0 }
-            };
-
-            CollectionAssert.AreEqual(array, result);
-
-            // Try to copy to a valid row and an invalid column (too short for the source span)
-            bool shouldBeTrue = values1.TryCopyTo(array.GetRow(2));
-            bool shouldBeFalse = values2.TryCopyTo(array.GetColumn(3));
-
-            Assert.IsTrue(shouldBeTrue);
-            Assert.IsFalse(shouldBeFalse);
-
-            result = new[,]
-            {
-                { 10, 11, 30, 40, 50 },
-                { 0, 22, 0, 0, 0 },
-                { 10, 20, 30, 40, 50 },
-                { 0, 44, 0, 0, 0 }
-            };
-
-            CollectionAssert.AreEqual(array, result);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpanExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpanExtensions.cs
deleted file mode 100644
index 4a588764d83..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpanExtensions.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;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    public class Test_SpanExtensions
-    {
-        [TestCategory("SpanExtensions")]
-        [TestMethod]
-        public void Test_SpanExtensions_DangerousGetReference()
-        {
-            Span<int> data = new[] { 1, 2, 3, 4, 5, 6, 7 };
-
-            ref int r0 = ref Unsafe.AsRef(data.DangerousGetReference());
-            ref int r1 = ref Unsafe.AsRef(data[0]);
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("SpanExtensions")]
-        [TestMethod]
-        public void Test_SpanExtensions_DangerousGetReferenceAt_Zero()
-        {
-            Span<int> data = new[] { 1, 2, 3, 4, 5, 6, 7 };
-
-            ref int r0 = ref Unsafe.AsRef(data.DangerousGetReference());
-            ref int r1 = ref Unsafe.AsRef(data.DangerousGetReferenceAt(0));
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("SpanExtensions")]
-        [TestMethod]
-        public void Test_SpanExtensions_DangerousGetReferenceAt_Index()
-        {
-            Span<int> data = new[] { 1, 2, 3, 4, 5, 6, 7 };
-
-            ref int r0 = ref Unsafe.AsRef(data.DangerousGetReferenceAt(5));
-            ref int r1 = ref Unsafe.AsRef(data[5]);
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("SpanExtensions")]
-        [TestMethod]
-        public void Test_SpanExtensions_IndexOf_Empty()
-        {
-            static void Test<T>()
-            {
-                Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
-                {
-                    T a = default;
-
-                    default(Span<T>).IndexOf(ref a);
-                });
-
-                Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
-                {
-                    Span<T> data = new T[] { default };
-
-                    data.Slice(1).IndexOf(ref data[0]);
-                });
-            }
-
-            Test<byte>();
-            Test<int>();
-            Test<Guid>();
-            Test<string>();
-            Test<object>();
-            Test<IEnumerable<int>>();
-        }
-
-        [TestCategory("SpanExtensions")]
-        [TestMethod]
-        public void Test_SpanExtensions_IndexOf_NotEmpty()
-        {
-            static void Test<T>()
-            {
-                Span<T> data = new T[] { default, default, default, default };
-
-                for (int i = 0; i < data.Length; i++)
-                {
-                    Assert.AreEqual(i, data.IndexOf(ref data[i]));
-                }
-            }
-
-            Test<byte>();
-            Test<int>();
-            Test<Guid>();
-            Test<string>();
-            Test<object>();
-            Test<IEnumerable<int>>();
-        }
-
-        [TestCategory("SpanExtensions")]
-        [TestMethod]
-        public void Test_SpanExtensions_IndexOf_NotEmpty_OutOfRange()
-        {
-            static void Test<T>()
-            {
-                // Before start
-                Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
-                {
-                    Span<T> data = new T[] { default, default, default, default };
-
-                    data.Slice(1).IndexOf(ref data[0]);
-                });
-
-                // After end
-                Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
-                {
-                    Span<T> data = new T[] { default, default, default, default };
-
-                    data.Slice(0, 2).IndexOf(ref data[2]);
-                });
-
-                // Local variable
-                Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
-                {
-                    var dummy = new T[] { default };
-                    Span<T> data = new T[] { default, default, default, default };
-
-                    data.IndexOf(ref dummy[0]);
-                });
-            }
-
-            Test<byte>();
-            Test<int>();
-            Test<Guid>();
-            Test<string>();
-            Test<object>();
-            Test<IEnumerable<int>>();
-        }
-
-        [TestCategory("SpanExtensions")]
-        [TestMethod]
-        public void Test_SpanExtensions_Enumerate()
-        {
-            Span<int> data = new[] { 1, 2, 3, 4, 5, 6, 7 };
-
-            int i = 0;
-
-            foreach (var item in data.Enumerate())
-            {
-                Assert.IsTrue(Unsafe.AreSame(ref data[i], ref item.Value));
-                Assert.AreEqual(i, item.Index);
-
-                i++;
-            }
-        }
-
-        [TestCategory("SpanExtensions")]
-        [TestMethod]
-        public void Test_SpanExtensions_Enumerate_Empty()
-        {
-            Span<int> data = Array.Empty<int>();
-
-            foreach (var item in data.Enumerate())
-            {
-                Assert.Fail("Empty source sequence");
-            }
-        }
-
-        [TestCategory("SpanExtensions")]
-        [TestMethod]
-        public void Test_SpanExtensions_CopyTo_RefEnumerable()
-        {
-            int[,] array = new int[4, 5];
-
-            int[]
-                values1 = { 10, 20, 30, 40, 50 },
-                values2 = { 11, 22, 33, 44, 55 };
-
-            // Copy a span to a target row and column with valid lengths
-            values1.AsSpan().CopyTo(array.GetRow(0));
-            values2.AsSpan(0, 4).CopyTo(array.GetColumn(1));
-
-            int[,] result =
-            {
-                { 10, 11, 30, 40, 50 },
-                { 0, 22, 0, 0, 0 },
-                { 0, 33, 0, 0, 0 },
-                { 0, 44, 0, 0, 0 }
-            };
-
-            CollectionAssert.AreEqual(array, result);
-
-            // Try to copy to a valid row and an invalid column (too short for the source span)
-            bool shouldBeTrue = values1.AsSpan().TryCopyTo(array.GetRow(2));
-            bool shouldBeFalse = values2.AsSpan().TryCopyTo(array.GetColumn(3));
-
-            Assert.IsTrue(shouldBeTrue);
-            Assert.IsFalse(shouldBeFalse);
-
-            result = new[,]
-            {
-                { 10, 11, 30, 40, 50 },
-                { 0, 22, 0, 0, 0 },
-                { 10, 20, 30, 40, 50 },
-                { 0, 44, 0, 0, 0 }
-            };
-
-            CollectionAssert.AreEqual(array, result);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpinLockExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpinLockExtensions.cs
deleted file mode 100644
index da0aec78ff3..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_SpinLockExtensions.cs
+++ /dev/null
@@ -1,74 +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.Diagnostics.CodeAnalysis;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    public class Test_SpinLockExtensions
-    {
-        [TestCategory("SpinLockExtensions")]
-        [TestMethod]
-        public unsafe void Test_ArrayExtensions_Pointer()
-        {
-            SpinLock spinLock = default;
-            SpinLock* p = &spinLock;
-
-            int sum = 0;
-
-            Parallel.For(0, 1000, i =>
-            {
-                for (int j = 0; j < 10; j++)
-                {
-                    using (SpinLockExtensions.Enter(p))
-                    {
-                        sum++;
-                    }
-                }
-            });
-
-            Assert.AreEqual(sum, 1000 * 10);
-        }
-
-        [TestCategory("SpinLockExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_Ref()
-        {
-            var spinLockOwner = new SpinLockOwner();
-
-            int sum = 0;
-
-            Parallel.For(0, 1000, i =>
-            {
-                for (int j = 0; j < 10; j++)
-                {
-#if WINDOWS_UWP
-                    using (SpinLockExtensions.Enter(spinLockOwner, ref spinLockOwner.Lock))
-#else
-                    using (spinLockOwner.Lock.Enter())
-#endif
-                    {
-                        sum++;
-                    }
-                }
-            });
-
-            Assert.AreEqual(sum, 1000 * 10);
-        }
-
-        /// <summary>
-        /// A dummy model that owns a <see cref="SpinLock"/> object.
-        /// </summary>
-        private sealed class SpinLockOwner
-        {
-            [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401", Justification = "Quick ref access for tests")]
-            public SpinLock Lock;
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StreamExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StreamExtensions.cs
deleted file mode 100644
index 3d907d7ce4c..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StreamExtensions.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.
-
-using System;
-using System.IO;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    public class Test_StreamExtensions
-    {
-        [TestCategory("StreamExtensions")]
-        [TestMethod]
-        public void Test_StreamExtensions_ReadWrite()
-        {
-            // bool (1), int (4), float (4), long (8) = 17 bytes.
-            // Leave two extra bytes for the partial read (fail).
-            Stream stream = new byte[19].AsMemory().AsStream();
-
-            stream.Write(true);
-            stream.Write(42);
-            stream.Write(3.14f);
-            stream.Write(unchecked(uint.MaxValue * 324823489204ul));
-
-            Assert.AreEqual(stream.Position, 17);
-
-            Assert.ThrowsException<ArgumentException>(() => stream.Write(long.MaxValue));
-
-            stream.Position = 0;
-
-            Assert.AreEqual(true, stream.Read<bool>());
-            Assert.AreEqual(42, stream.Read<int>());
-            Assert.AreEqual(3.14f, stream.Read<float>());
-            Assert.AreEqual(unchecked(uint.MaxValue * 324823489204ul), stream.Read<ulong>());
-
-            Assert.ThrowsException<InvalidOperationException>(() => stream.Read<long>());
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StringExtensions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StringExtensions.cs
deleted file mode 100644
index 0ea729dcf17..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Extensions/Test_StringExtensions.cs
+++ /dev/null
@@ -1,51 +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.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    public class Test_StringExtensions
-    {
-        [TestCategory("StringExtensions")]
-        [TestMethod]
-        public void Test_StringExtensions_DangerousGetReference()
-        {
-            string text = "Hello, world!";
-
-            ref char r0 = ref text.DangerousGetReference();
-            ref char r1 = ref Unsafe.AsRef(text.AsSpan()[0]);
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("StringExtensions")]
-        [TestMethod]
-        public void Test_StringExtensions_DangerousGetReferenceAt_Zero()
-        {
-            string text = "Hello, world!";
-
-            ref char r0 = ref text.DangerousGetReference();
-            ref char r1 = ref text.DangerousGetReferenceAt(0);
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-
-        [TestCategory("StringExtensions")]
-        [TestMethod]
-        public void Test_StringExtensions_DangerousGetReferenceAt_Index()
-        {
-            string text = "Hello, world!";
-
-            ref char r0 = ref text.DangerousGetReferenceAt(5);
-            ref char r1 = ref Unsafe.AsRef(text.AsSpan()[5]);
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref r1));
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs
deleted file mode 100644
index 650149281e7..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_BitHelper.cs
+++ /dev/null
@@ -1,325 +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.HighPerformance.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Helpers
-{
-    [TestClass]
-    public class Test_BitHelper
-    {
-        [TestCategory("BitHelper")]
-        [TestMethod]
-        public void Test_BitHelper_HasFlag_UInt32()
-        {
-            uint value = 0b10_1001110101_0110010010_1100100010;
-
-            Assert.IsFalse(BitHelper.HasFlag(value, 0));
-            Assert.IsTrue(BitHelper.HasFlag(value, 1));
-            Assert.IsFalse(BitHelper.HasFlag(value, 2));
-            Assert.IsTrue(BitHelper.HasFlag(value, 9));
-            Assert.IsFalse(BitHelper.HasFlag(value, 10));
-            Assert.IsFalse(BitHelper.HasFlag(value, 30));
-            Assert.IsTrue(BitHelper.HasFlag(value, 31));
-        }
-
-        [TestCategory("BitHelper")]
-        [TestMethod]
-        [DataRow(0, true)]
-        [DataRow(1, false)]
-        [DataRow(6, true)]
-        [DataRow(7, false)]
-        [DataRow(12, true)]
-        [DataRow(14, true)]
-        [DataRow(15, false)]
-        [DataRow(20, false)]
-        [DataRow(21, true)]
-        [DataRow(30, false)]
-        [DataRow(31, true)]
-        [DataRow(42, false)]
-        [DataRow(43741384, false)]
-        [DataRow(int.MaxValue, false)]
-        public void Test_BitHelper_HasLookupFlag_Default(int index, bool flag)
-        {
-            const uint value = 0xAAAA5555u;
-
-            Assert.AreEqual(flag, BitHelper.HasLookupFlag(value, index));
-        }
-
-        [TestCategory("BitHelper")]
-        [TestMethod]
-        [DataRow('+', true)]
-        [DataRow('-', true)]
-        [DataRow('>', true)]
-        [DataRow('<', true)]
-        [DataRow('.', true)]
-        [DataRow(',', true)]
-        [DataRow('(', true)]
-        [DataRow(')', true)]
-        [DataRow(':', true)]
-        [DataRow('a', false)]
-        [DataRow('%', false)]
-        [DataRow('A', false)]
-        [DataRow('€', false)]
-        [DataRow(0, false)]
-        [DataRow(1, false)]
-        [DataRow(-1, false)]
-        [DataRow(int.MaxValue, false)]
-        [DataRow(int.MinValue, false)]
-        [DataRow(short.MaxValue, false)]
-        [DataRow(short.MinValue, false)]
-        public void Test_BitHelper_HasLookupFlag32_WithMin(int x, bool flag)
-        {
-            const uint mask = 8126587;
-
-            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]
-        [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()
-        {
-            Assert.AreEqual(0b1u, BitHelper.SetFlag(0u, 0, true));
-            Assert.AreEqual(4u, BitHelper.SetFlag(4u, 1, false));
-            Assert.AreEqual(0b110u, BitHelper.SetFlag(2u, 2, true));
-            Assert.AreEqual(unchecked((uint)int.MinValue), BitHelper.SetFlag(0u, 31, true));
-        }
-
-        [TestCategory("BitHelper")]
-        [TestMethod]
-        [DataRow(0u, (byte)0, (byte)0, 0u)]
-        [DataRow(uint.MaxValue, (byte)0, (byte)8, 255u)]
-        [DataRow(uint.MaxValue, (byte)24, (byte)8, 255u)]
-        [DataRow(12345u << 7, (byte)7, (byte)16, 12345u)]
-        [DataRow(3u << 1, (byte)1, (byte)2, 3u)]
-        [DataRow(21u << 17, (byte)17, (byte)5, 21u)]
-        [DataRow(1u << 31, (byte)31, (byte)1, 1u)]
-        public void Test_BitHelper_ExtractRange_UInt32(uint value, byte start, byte length, uint result)
-        {
-            Assert.AreEqual(result, BitHelper.ExtractRange(value, start, length));
-        }
-
-        [TestCategory("BitHelper")]
-        [TestMethod]
-        [DataRow((byte)0, (byte)0, 0u)]
-        [DataRow((byte)0, (byte)8, 255u)]
-        [DataRow((byte)24, (byte)8, 255u)]
-        [DataRow((byte)0, (byte)31, (uint)int.MaxValue)]
-        [DataRow((byte)29, (byte)3, 5u)]
-        [DataRow((byte)7, (byte)14, 12345u)]
-        [DataRow((byte)1, (byte)2, 3u)]
-        [DataRow((byte)17, (byte)5, 21u)]
-        [DataRow((byte)31, (byte)1, 1u)]
-        public void Test_BitHelper_SetRange_UInt32(byte start, byte length, uint flags)
-        {
-            // Specific initial bit mask to check for unwanted modifications
-            const uint value = 0xAAAA5555u;
-
-            uint
-                backup = BitHelper.ExtractRange(value, start, length),
-                result = BitHelper.SetRange(value, start, length, flags),
-                extracted = BitHelper.ExtractRange(result, start, length),
-                restored = BitHelper.SetRange(result, start, length, backup);
-
-            Assert.AreEqual(extracted, flags);
-            Assert.AreEqual(restored, value);
-        }
-
-        [TestCategory("BitHelper")]
-        [TestMethod]
-        public void Test_UInt64Extensions_HasFlag()
-        {
-            ulong value = 0b10_1001110101_0110010010_1100100010;
-
-            value |= 1ul << 63;
-
-            Assert.IsFalse(BitHelper.HasFlag(value, 0));
-            Assert.IsTrue(BitHelper.HasFlag(value, 1));
-            Assert.IsFalse(BitHelper.HasFlag(value, 2));
-            Assert.IsTrue(BitHelper.HasFlag(value, 9));
-            Assert.IsFalse(BitHelper.HasFlag(value, 10));
-            Assert.IsFalse(BitHelper.HasFlag(value, 30));
-            Assert.IsTrue(BitHelper.HasFlag(value, 31));
-            Assert.IsTrue(BitHelper.HasFlag(value, 63));
-        }
-
-        [TestCategory("BitHelper")]
-        [TestMethod]
-        [DataRow('+', true)]
-        [DataRow('-', true)]
-        [DataRow('>', true)]
-        [DataRow('<', true)]
-        [DataRow('.', true)]
-        [DataRow(',', true)]
-        [DataRow('[', true)]
-        [DataRow(']', true)]
-        [DataRow('(', true)]
-        [DataRow(')', true)]
-        [DataRow(':', true)]
-        [DataRow('a', false)]
-        [DataRow('%', false)]
-        [DataRow('A', false)]
-        [DataRow('€', false)]
-        [DataRow(0, false)]
-        [DataRow(1, false)]
-        [DataRow(-1, false)]
-        [DataRow(int.MaxValue, false)]
-        [DataRow(int.MinValue, false)]
-        [DataRow(short.MaxValue, false)]
-        [DataRow(short.MinValue, false)]
-        public void Test_BitHelper_HasLookupFlag64_WithMin(int x, bool flag)
-        {
-            const ulong mask = 11258999073931387;
-
-            Assert.AreEqual(flag, BitHelper.HasLookupFlag(mask, x, 40));
-        }
-
-        [TestCategory("BitHelper")]
-        [TestMethod]
-        public void Test_UInt64Extensions_SetFlag()
-        {
-            Assert.AreEqual(0b1ul, BitHelper.SetFlag(0u, 0, true));
-            Assert.AreEqual(4ul, BitHelper.SetFlag(4u, 1, false));
-            Assert.AreEqual(0b110ul, BitHelper.SetFlag(2u, 2, true));
-            Assert.AreEqual(1ul << 31, BitHelper.SetFlag(0ul, 31, true));
-            Assert.AreEqual(1ul << 63, BitHelper.SetFlag(0ul, 63, true));
-        }
-
-        [TestCategory("BitHelper")]
-        [TestMethod]
-        [DataRow(0u, (byte)0, (byte)0, 0u)]
-        [DataRow(uint.MaxValue, (byte)0, (byte)8, 255u)]
-        [DataRow(uint.MaxValue, (byte)24, (byte)8, 255u)]
-        [DataRow(12345u << 7, (byte)7, (byte)16, 12345u)]
-        [DataRow(3u << 1, (byte)1, (byte)2, 3u)]
-        [DataRow(21u << 17, (byte)17, (byte)5, 21u)]
-        [DataRow(1u << 31, (byte)31, (byte)1, 1u)]
-        [DataRow(ulong.MaxValue, (byte)0, (byte)8, 255u)]
-        [DataRow(ulong.MaxValue, (byte)24, (byte)8, 255u)]
-        [DataRow(ulong.MaxValue, (byte)44, (byte)8, 255u)]
-        [DataRow(12345ul << 35, (byte)35, (byte)16, 12345ul)]
-        [DataRow(3ul << 56, (byte)56, (byte)2, 3ul)]
-        [DataRow(21ul << 37, (byte)37, (byte)5, 21ul)]
-        [DataRow(1ul << 63, (byte)63, (byte)1, 1ul)]
-        public void Test_BitHelper_ExtractRange_UInt64(ulong value, byte start, byte length, ulong result)
-        {
-            Assert.AreEqual(result, BitHelper.ExtractRange(value, start, length));
-        }
-
-        [TestCategory("BitHelper")]
-        [TestMethod]
-        [DataRow((byte)0, (byte)0, 0u)]
-        [DataRow((byte)0, (byte)8, 255ul)]
-        [DataRow((byte)24, (byte)8, 255ul)]
-        [DataRow((byte)0, (byte)31, (ulong)int.MaxValue)]
-        [DataRow((byte)29, (byte)3, 5ul)]
-        [DataRow((byte)7, (byte)14, 12345ul)]
-        [DataRow((byte)1, (byte)2, 3ul)]
-        [DataRow((byte)17, (byte)5, 21ul)]
-        [DataRow((byte)31, (byte)1, 1ul)]
-        [DataRow((byte)44, (byte)8, 255ul)]
-        [DataRow((byte)23, (byte)8, 255ul)]
-        [DataRow((byte)55, (byte)3, 5ul)]
-        [DataRow((byte)34, (byte)14, 12345ul)]
-        [DataRow((byte)59, (byte)2, 3ul)]
-        [DataRow((byte)45, (byte)5, 21ul)]
-        [DataRow((byte)62, (byte)1, 1ul)]
-        public void Test_BitHelper_SetRange_UInt64(byte start, byte length, ulong flags)
-        {
-            // Specific initial bit mask to check for unwanted modifications
-            const ulong value = 0xAAAA5555AAAA5555u;
-
-            ulong
-                backup = BitHelper.ExtractRange(value, start, length),
-                result = BitHelper.SetRange(value, start, length, flags),
-                extracted = BitHelper.ExtractRange(result, start, length),
-                restored = BitHelper.SetRange(result, start, length, backup);
-
-            Assert.AreEqual(extracted, flags);
-            Assert.AreEqual(restored, value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs
deleted file mode 100644
index e2fe62b5003..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_HashCode{T}.cs
+++ /dev/null
@@ -1,134 +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.CodeAnalysis;
-using System.Diagnostics.Contracts;
-using System.Runtime.InteropServices;
-using Microsoft.Toolkit.HighPerformance.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using UnitTests.HighPerformance.Shared.Buffers.Internals;
-
-namespace UnitTests.HighPerformance.Helpers
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_HashCodeOfT
-    {
-        /// <summary>
-        /// Gets the list of counts to test the extension for
-        /// </summary>
-        private static ReadOnlySpan<int> TestCounts => new[] { 0, 1, 7, 128, 255, 256, short.MaxValue, short.MaxValue + 1, 123_938, 1_678_922, 71_890_819 };
-
-        [TestCategory("HashCodeOfT")]
-        [TestMethod]
-        public void Test_HashCodeOfT_VectorSupportedTypes_TestRepeatCount8()
-        {
-            TestForType<byte>();
-            TestForType<sbyte>();
-            TestForType<bool>();
-        }
-
-        [TestCategory("HashCodeOfT")]
-        [TestMethod]
-        public void Test_HashCodeOfT_VectorSupportedTypes_TestRepeatCount16()
-        {
-            TestForType<ushort>();
-            TestForType<short>();
-        }
-
-        [TestCategory("HashCodeOfT")]
-        [TestMethod]
-        public void Test_HashCodeOfT_VectorSupportedTypes_TestRepeatCount32()
-        {
-            TestForType<uint>();
-            TestForType<int>();
-            TestForType<float>();
-        }
-
-        [TestCategory("HashCodeOfT")]
-        [TestMethod]
-        public void Test_HashCodeOfT_VectorSupportedTypes_TestRepeatCount64()
-        {
-            TestForType<ulong>();
-            TestForType<long>();
-            TestForType<double>();
-        }
-
-        [TestCategory("HashCodeOfT")]
-        [TestMethod]
-        public void Test_HashCodeOfT_VectorUnsupportedTypes_TestRepeat()
-        {
-            TestForType<char>();
-        }
-
-#if NETCOREAPP3_1 || NET5_0
-        [TestCategory("HashCodeOfT")]
-        [TestMethod]
-        public void Test_HashCodeOfT_ManagedType_TestRepeat()
-        {
-            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]];
-
-            var random = new Random();
-            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(iterationData);
-                int hash2 = HashCode<string>.Combine(iterationData);
-
-                Assert.AreEqual(hash1, hash2, $"Failed {typeof(string)} test with count {count}: got {hash1} and then {hash2}");
-            }
-        }
-#endif
-
-        /// <summary>
-        /// Performs a test for a specified type.
-        /// </summary>
-        /// <typeparam name="T">The type to test.</typeparam>
-        private static void TestForType<T>()
-            where T : unmanaged, IEquatable<T>
-        {
-            foreach (var count in TestCounts)
-            {
-                using UnmanagedSpanOwner<T> data = CreateRandomData<T>(count);
-
-                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}");
-            }
-        }
-
-        /// <summary>
-        /// Creates a random <typeparamref name="T"/> array filled with random data.
-        /// </summary>
-        /// <typeparam name="T">The type of items to put in the array.</typeparam>
-        /// <param name="count">The number of array items to create.</param>
-        /// <returns>An array of random <typeparamref name="T"/> elements.</returns>
-        [Pure]
-        private static UnmanagedSpanOwner<T> CreateRandomData<T>(int count)
-            where T : unmanaged
-        {
-            var random = new Random(count);
-
-            UnmanagedSpanOwner<T> data = new UnmanagedSpanOwner<T>(count);
-
-            foreach (ref byte n in MemoryMarshal.AsBytes(data.GetSpan()))
-            {
-                n = (byte)random.Next(0, byte.MaxValue);
-            }
-
-            return data;
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ObjectMarshal.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ObjectMarshal.cs
deleted file mode 100644
index 7422bc49c46..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ObjectMarshal.cs
+++ /dev/null
@@ -1,123 +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.HighPerformance.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Extensions
-{
-    [TestClass]
-    public class Test_ObjectMarshal
-    {
-        [TestCategory("ObjectMarshal")]
-        [TestMethod]
-        public void Test_DangerousGetObjectDataByteOffset()
-        {
-            var a = new TestClass { Number = 42, Character = 'a', Text = "Hello" };
-
-            IntPtr ptr = ObjectMarshal.DangerousGetObjectDataByteOffset(a, ref a.Number);
-
-            ref int number = ref ObjectMarshal.DangerousGetObjectDataReferenceAt<int>(a, ptr);
-
-            Assert.IsTrue(Unsafe.AreSame(ref a.Number, ref number));
-
-            ptr = ObjectMarshal.DangerousGetObjectDataByteOffset(a, ref a.Character);
-
-            ref char character = ref ObjectMarshal.DangerousGetObjectDataReferenceAt<char>(a, ptr);
-
-            Assert.IsTrue(Unsafe.AreSame(ref a.Character, ref character));
-
-            ptr = ObjectMarshal.DangerousGetObjectDataByteOffset(a, ref a.Text);
-
-            ref string text = ref ObjectMarshal.DangerousGetObjectDataReferenceAt<string>(a, ptr);
-
-            Assert.IsTrue(Unsafe.AreSame(ref a.Text, ref text));
-        }
-
-        internal class TestClass
-        {
-#pragma warning disable SA1401 // Fields should be private
-            public int Number;
-            public char Character;
-            public string Text;
-#pragma warning restore SA1401
-        }
-
-        [TestCategory("ObjectMarshal")]
-        [TestMethod]
-        public void Test_BoxOfT_PrimitiveTypes()
-        {
-            Test(true);
-            Test(false);
-            Test<byte>(27);
-            Test('a');
-            Test(4221124);
-            Test(3.14f);
-            Test(8394324ul);
-            Test(184013.234324);
-        }
-
-        [TestCategory("ObjectMarshal")]
-        [TestMethod]
-        public void Test_BoxOfT_OtherTypes()
-        {
-            Test(DateTime.Now);
-            Test(Guid.NewGuid());
-        }
-
-        internal struct TestStruct : IEquatable<TestStruct>
-        {
-            public int Number;
-            public char Character;
-            public string Text;
-
-            /// <inheritdoc/>
-            public bool Equals(TestStruct other)
-            {
-                return
-                    this.Number == other.Number &&
-                    this.Character == other.Character &&
-                    this.Text == other.Text;
-            }
-        }
-
-        [TestCategory("ObjectMarshal")]
-        [TestMethod]
-        public void TestBoxOfT_CustomStruct()
-        {
-            var a = new TestStruct { Number = 42, Character = 'a', Text = "Hello" };
-            var b = new TestStruct { Number = 38293, Character = 'z', Text = "World" };
-
-            Test(a);
-            Test(b);
-        }
-
-        /// <summary>
-        /// Tests the extensions type for a given value.
-        /// </summary>
-        /// <typeparam name="T">The type to test.</typeparam>
-        /// <param name="value">The initial <typeparamref name="T"/> value.</param>
-        private static void Test<T>(T value)
-            where T : struct, IEquatable<T>
-        {
-            object obj = value;
-
-            bool success = obj.TryUnbox(out T result);
-
-            Assert.IsTrue(success);
-            Assert.AreEqual(value, result);
-
-            success = obj.TryUnbox(out decimal test);
-
-            Assert.IsFalse(success);
-            Assert.AreEqual(test, default);
-
-            result = ObjectMarshal.DangerousUnbox<T>(obj);
-
-            Assert.AreEqual(value, result);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For.cs
deleted file mode 100644
index d9bdc729b98..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For.cs
+++ /dev/null
@@ -1,114 +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.HighPerformance;
-using Microsoft.Toolkit.HighPerformance.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using UnitTests.HighPerformance.Shared.Buffers.Internals;
-
-namespace UnitTests.HighPerformance.Helpers
-{
-    [TestClass]
-    public partial class Test_ParallelHelper
-    {
-        /// <summary>
-        /// Gets the list of counts to test the For (1D) extensions for
-        /// </summary>
-        private static ReadOnlySpan<int> TestForCounts => new[] { 0, 1, 7, 128, 255, 256, short.MaxValue, short.MaxValue + 1, 123_938, 1_678_922, 71_890_819 };
-
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        public unsafe void Test_ParallelHelper_ForWithIndices()
-        {
-            foreach (int count in TestForCounts)
-            {
-                using UnmanagedSpanOwner<int> data = new UnmanagedSpanOwner<int>(count);
-
-                data.GetSpan().Clear();
-
-                ParallelHelper.For(0, data.Length, new Assigner(data.Length, data.Ptr));
-
-                foreach (var item in data.GetSpan().Enumerate())
-                {
-                    if (item.Index != item.Value)
-                    {
-                        Assert.Fail($"Invalid item at position {item.Index}, value was {item.Value}");
-                    }
-                }
-            }
-        }
-
-#if NETCOREAPP3_1 || NET5_0
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_ParallelHelper_ForInvalidRange_FromEnd()
-        {
-            ParallelHelper.For<Assigner>(..^1);
-        }
-
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_ParallelHelper_ForInvalidRange_RangeAll()
-        {
-            ParallelHelper.For<Assigner>(..);
-        }
-
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        public unsafe void Test_ParallelHelper_ForWithRanges()
-        {
-            foreach (int count in TestForCounts)
-            {
-                using UnmanagedSpanOwner<int> data = new UnmanagedSpanOwner<int>(count);
-
-                data.GetSpan().Clear();
-
-                ParallelHelper.For(..data.Length, new Assigner(data.Length, data.Ptr));
-
-                foreach (var item in data.GetSpan().Enumerate())
-                {
-                    if (item.Index != item.Value)
-                    {
-                        Assert.Fail($"Invalid item at position {item.Index}, value was {item.Value}");
-                    }
-                }
-            }
-        }
-#endif
-
-        /// <summary>
-        /// A type implementing <see cref="IAction"/> to initialize an array
-        /// </summary>
-        private readonly unsafe struct Assigner : IAction
-        {
-            private readonly int length;
-            private readonly int* ptr;
-
-            public Assigner(int length, int* ptr)
-            {
-                this.length = length;
-                this.ptr = ptr;
-            }
-
-            /// <inheritdoc/>
-            public void Invoke(int i)
-            {
-                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.ptr[i]} instead of 0");
-                }
-
-                this.ptr[i] = i;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For2D.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For2D.cs
deleted file mode 100644
index 47f4f172a22..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.For2D.cs
+++ /dev/null
@@ -1,131 +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.Drawing;
-using Microsoft.Toolkit.HighPerformance.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using UnitTests.HighPerformance.Shared.Buffers.Internals;
-
-namespace UnitTests.HighPerformance.Helpers
-{
-    public partial class Test_ParallelHelper
-    {
-        /// <summary>
-        /// Gets the list of counts to test the For2D extensions for
-        /// </summary>
-        private static ReadOnlySpan<Size> TestFor2DSizes => new[]
-        {
-            new Size(0, 0),
-            new Size(0, 1),
-            new Size(1, 1),
-            new Size(3, 3),
-            new Size(1024, 1024),
-            new Size(512, 2175),
-            new Size(4039, 11231)
-        };
-
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        public unsafe void Test_ParallelHelper_For2DWithIndices()
-        {
-            foreach (var size in TestFor2DSizes)
-            {
-                using UnmanagedSpanOwner<int> data = new UnmanagedSpanOwner<int>(size.Height * size.Width);
-
-                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.Ptr[(i * size.Width) + j] != 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)}");
-                        }
-                    }
-                }
-            }
-        }
-
-#if NETCOREAPP3_1 || NET5_0
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_ParallelHelper_For2DInvalidRange_FromEnd()
-        {
-            ParallelHelper.For2D<Assigner2D>(..^1, ..4);
-        }
-
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_ParallelHelper_For2DInvalidRange_RangeAll()
-        {
-            ParallelHelper.For2D<Assigner2D>(..5, ..);
-        }
-
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        public unsafe void Test_ParallelHelper_For2DWithRanges()
-        {
-            foreach (var size in TestFor2DSizes)
-            {
-                using UnmanagedSpanOwner<int> data = new UnmanagedSpanOwner<int>(size.Height * size.Width);
-
-                data.GetSpan().Clear();
-
-                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.Ptr[(i * size.Width) + j] != 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)}");
-                        }
-                    }
-                }
-            }
-        }
-#endif
-
-        /// <summary>
-        /// A type implementing <see cref="IAction"/> to initialize a 2D array
-        /// </summary>
-        private readonly unsafe struct Assigner2D : IAction2D
-        {
-            private readonly int height;
-            private readonly int width;
-            private readonly int* ptr;
-
-            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 ((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.ptr[(i * this.width) + j]} instead of 0");
-                }
-
-                this.ptr[(i * this.width) + j] = unchecked(i * 397 ^ j);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In.cs
deleted file mode 100644
index 82235bea7b3..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In.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.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using Microsoft.Toolkit.HighPerformance.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using UnitTests.HighPerformance.Shared.Buffers.Internals;
-
-namespace UnitTests.HighPerformance.Helpers
-{
-    public partial class Test_ParallelHelper
-    {
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        public unsafe void Test_ParallelHelper_ForEach_In()
-        {
-            foreach (int count in TestForCounts)
-            {
-                using UnmanagedSpanOwner<int> data = CreateRandomData(count);
-
-                int sum = 0;
-
-                ParallelHelper.ForEach<int, Summer>(data.Memory, new Summer(&sum));
-
-                int expected = 0;
-
-                foreach (int n in data.GetSpan())
-                {
-                    expected += n;
-                }
-
-                Assert.AreEqual(sum, expected, $"The sum doesn't match, was {sum} instead of {expected}");
-            }
-        }
-
-        /// <summary>
-        /// A type implementing <see cref="IInAction{T}"/> to sum array elements.
-        /// </summary>
-        private readonly unsafe struct Summer : IInAction<int>
-        {
-            private readonly int* ptr;
-
-            public Summer(int* ptr) => this.ptr = ptr;
-
-            /// <inheritdoc/>
-            public void Invoke(in int i) => Interlocked.Add(ref Unsafe.AsRef<int>(this.ptr), i);
-        }
-
-        /// <summary>
-        /// Creates a random <see cref="int"/> array filled with random numbers.
-        /// </summary>
-        /// <param name="count">The number of array items to create.</param>
-        /// <returns>An array of random <see cref="int"/> elements.</returns>
-        [Pure]
-        private static UnmanagedSpanOwner<int> CreateRandomData(int count)
-        {
-            var random = new Random(count);
-
-            UnmanagedSpanOwner<int> data = new UnmanagedSpanOwner<int>(count);
-
-            foreach (ref int n in data.GetSpan())
-            {
-                n = random.Next(0, byte.MaxValue);
-            }
-
-            return data;
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In2D.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In2D.cs
deleted file mode 100644
index 3759fa5ee6b..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.In2D.cs
+++ /dev/null
@@ -1,80 +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 Microsoft.Toolkit.HighPerformance;
-using Microsoft.Toolkit.HighPerformance.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Helpers
-{
-    public partial class Test_ParallelHelper
-    {
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        [DataRow(1, 1, 0, 0, 1, 1)]
-        [DataRow(1, 2, 0, 0, 1, 2)]
-        [DataRow(2, 3, 0, 0, 2, 3)]
-        [DataRow(2, 3, 0, 1, 2, 2)]
-        [DataRow(3, 3, 1, 1, 2, 2)]
-        [DataRow(12, 12, 2, 4, 3, 3)]
-        [DataRow(64, 64, 0, 0, 32, 32)]
-        [DataRow(64, 64, 13, 14, 23, 22)]
-        public unsafe void Test_ParallelHelper_ForEach_In2D(
-            int sizeY,
-            int sizeX,
-            int row,
-            int column,
-            int height,
-            int width)
-        {
-            int[,] data = CreateRandomData2D(sizeY, sizeX);
-
-            // Create a memory wrapping the random array with the given parameters
-            ReadOnlyMemory2D<int> memory = data.AsMemory2D(row, column, height, width);
-
-            Assert.AreEqual(memory.Length, height * width);
-            Assert.AreEqual(memory.Height, height);
-            Assert.AreEqual(memory.Width, width);
-
-            int sum = 0;
-
-            // Sum all the items in parallel. The Summer type takes a pointer to a target value
-            // and adds values to it in a thread-safe manner (with an interlocked add).
-            ParallelHelper.ForEach(memory, new Summer(&sum));
-
-            int expected = 0;
-
-            // Calculate the sum iteratively as a baseline for comparison
-            foreach (int n in memory.Span)
-            {
-                expected += n;
-            }
-
-            Assert.AreEqual(sum, expected, $"The sum doesn't match, was {sum} instead of {expected}");
-        }
-
-        /// <summary>
-        /// Creates a random 2D <see cref="int"/> array filled with random numbers.
-        /// </summary>
-        /// <param name="height">The height of the array to create.</param>
-        /// <param name="width">The width of the array to create.</param>
-        /// <returns>An array of random <see cref="int"/> elements.</returns>
-        [Pure]
-        private static int[,] CreateRandomData2D(int height, int width)
-        {
-            var random = new Random((height * 33) + width);
-
-            int[,] data = new int[height, width];
-
-            foreach (ref int n in data.AsSpan2D())
-            {
-                n = random.Next(0, byte.MaxValue);
-            }
-
-            return data;
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref.cs
deleted file mode 100644
index ceb11f44d72..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref.cs
+++ /dev/null
@@ -1,58 +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.HighPerformance.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using UnitTests.HighPerformance.Shared.Buffers.Internals;
-
-namespace UnitTests.HighPerformance.Helpers
-{
-    public partial class Test_ParallelHelper
-    {
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        public void Test_ParallelHelper_ForEach_Ref()
-        {
-            foreach (int count in TestForCounts)
-            {
-                using UnmanagedSpanOwner<int> data = CreateRandomData(count);
-                using UnmanagedSpanOwner<int> copy = new UnmanagedSpanOwner<int>(count);
-
-                data.GetSpan().CopyTo(copy.GetSpan());
-
-                foreach (ref int n in copy.GetSpan())
-                {
-                    n = unchecked(n * 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 (dataSpan[i] != copySpan[i])
-                    {
-                        Assert.Fail($"Item #{i} was not a match, was {dataSpan[i]} instead of {copySpan[i]}");
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// A type implementing <see cref="IRefAction{T}"/> to multiply array elements.
-        /// </summary>
-        private readonly struct Multiplier : IRefAction<int>
-        {
-            private readonly int factor;
-
-            public Multiplier(int factor) => this.factor = factor;
-
-            /// <inheritdoc/>
-            public void Invoke(ref int i) => i = unchecked(i * this.factor);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref2D.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref2D.cs
deleted file mode 100644
index 1a3e1eaf36d..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ForEach.Ref2D.cs
+++ /dev/null
@@ -1,53 +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.HighPerformance;
-using Microsoft.Toolkit.HighPerformance.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Helpers
-{
-    public partial class Test_ParallelHelper
-    {
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        [DataRow(1, 1, 0, 0, 1, 1)]
-        [DataRow(1, 2, 0, 0, 1, 2)]
-        [DataRow(2, 3, 0, 0, 2, 3)]
-        [DataRow(2, 3, 0, 1, 2, 2)]
-        [DataRow(3, 3, 1, 1, 2, 2)]
-        [DataRow(12, 12, 2, 4, 3, 3)]
-        [DataRow(64, 64, 0, 0, 32, 32)]
-        [DataRow(64, 64, 13, 14, 23, 22)]
-        public void Test_ParallelHelper_ForEach_Ref2D(
-            int sizeY,
-            int sizeX,
-            int row,
-            int column,
-            int height,
-            int width)
-        {
-            int[,]
-                data = CreateRandomData2D(sizeY, sizeX),
-                copy = (int[,])data.Clone();
-
-            // Prepare the target data iteratively
-            foreach (ref int n in copy.AsSpan2D(row, column, height, width))
-            {
-                n = unchecked(n * 397);
-            }
-
-            Memory2D<int> memory = data.AsMemory2D(row, column, height, width);
-
-            Assert.AreEqual(memory.Length, height * width);
-            Assert.AreEqual(memory.Height, height);
-            Assert.AreEqual(memory.Width, width);
-
-            // Do the same computation in paralellel, then compare the two arrays
-            ParallelHelper.ForEach(memory, new Multiplier(397));
-
-            CollectionAssert.AreEqual(data, copy);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ThrowExceptions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ThrowExceptions.cs
deleted file mode 100644
index b85d743cd14..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Helpers/Test_ParallelHelper.ThrowExceptions.cs
+++ /dev/null
@@ -1,160 +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.HighPerformance.Helpers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using ArgumentOutOfRangeException = System.ArgumentOutOfRangeException;
-
-namespace UnitTests.HighPerformance.Helpers
-{
-    public partial class Test_ParallelHelper
-    {
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        public void Test_ParallelHelper_ParameterName_ThrowArgumentOutOfRangeExceptionForInvalidMinimumActionsPerThread()
-        {
-            try
-            {
-                ParallelHelper.For<DummyAction>(0, 1, -1);
-            }
-            catch (ArgumentOutOfRangeException e) when (e.GetType() == typeof(ArgumentOutOfRangeException))
-            {
-                var name = (
-                    from method in typeof(ParallelHelper).GetMethods()
-                    where
-                        method.Name == nameof(ParallelHelper.For) &&
-                        method.IsGenericMethodDefinition
-                    let typeParams = method.GetGenericArguments()
-                    let normalParams = method.GetParameters()
-                    where
-                        typeParams.Length == 1 &&
-                        normalParams.Length == 3 &&
-                        normalParams.All(p => p.ParameterType == typeof(int))
-                    select normalParams[2].Name).Single();
-
-                Assert.AreEqual(e.ParamName, name);
-
-                return;
-            }
-
-            Assert.Fail("Failed to raise correct exception");
-        }
-
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        public void Test_ParallelHelper_ParameterName_ThrowArgumentOutOfRangeExceptionForStartGreaterThanEnd()
-        {
-            try
-            {
-                ParallelHelper.For<DummyAction>(1, 0);
-            }
-            catch (ArgumentOutOfRangeException e) when (e.GetType() == typeof(ArgumentOutOfRangeException))
-            {
-                var name = (
-                    from method in typeof(ParallelHelper).GetMethods()
-                    where
-                        method.Name == nameof(ParallelHelper.For) &&
-                        method.IsGenericMethodDefinition
-                    let typeParams = method.GetGenericArguments()
-                    let normalParams = method.GetParameters()
-                    where
-                        typeParams.Length == 1 &&
-                        normalParams.Length == 2 &&
-                        normalParams.All(p => p.ParameterType == typeof(int))
-                    select normalParams[0].Name).Single();
-
-                Assert.AreEqual(e.ParamName, name);
-
-                return;
-            }
-
-            Assert.Fail("Failed to raise correct exception");
-        }
-
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        public void Test_ParallelHelper_ParameterName_ThrowArgumentOutOfRangeExceptionForTopGreaterThanBottom()
-        {
-            try
-            {
-                ParallelHelper.For2D<DummyAction2D>(1, 0, 0, 1);
-            }
-            catch (ArgumentOutOfRangeException e) when (e.GetType() == typeof(ArgumentOutOfRangeException))
-            {
-                var name = (
-                    from method in typeof(ParallelHelper).GetMethods()
-                    where
-                        method.Name == nameof(ParallelHelper.For2D) &&
-                        method.IsGenericMethodDefinition
-                    let typeParams = method.GetGenericArguments()
-                    let normalParams = method.GetParameters()
-                    where
-                        typeParams.Length == 1 &&
-                        normalParams.Length == 4 &&
-                        normalParams.All(p => p.ParameterType == typeof(int))
-                    select normalParams[0].Name).Single();
-
-                Assert.AreEqual(e.ParamName, name);
-
-                return;
-            }
-
-            Assert.Fail("Failed to raise correct exception");
-        }
-
-        [TestCategory("ParallelHelper")]
-        [TestMethod]
-        public void Test_ParallelHelper_ParameterName_ThrowArgumentOutOfRangeExceptionForLeftGreaterThanRight()
-        {
-            try
-            {
-                ParallelHelper.For2D<DummyAction2D>(0, 1, 1, 0);
-            }
-            catch (ArgumentOutOfRangeException e) when (e.GetType() == typeof(ArgumentOutOfRangeException))
-            {
-                var name = (
-                    from method in typeof(ParallelHelper).GetMethods()
-                    where
-                        method.Name == nameof(ParallelHelper.For2D) &&
-                        method.IsGenericMethodDefinition
-                    let typeParams = method.GetGenericArguments()
-                    let normalParams = method.GetParameters()
-                    where
-                        typeParams.Length == 1 &&
-                        normalParams.Length == 4 &&
-                        normalParams.All(p => p.ParameterType == typeof(int))
-                    select normalParams[2].Name).Single();
-
-                Assert.AreEqual(e.ParamName, name);
-
-                return;
-            }
-
-            Assert.Fail("Failed to raise correct exception");
-        }
-
-        /// <summary>
-        /// A dummy type implementing <see cref="IAction"/>
-        /// </summary>
-        private readonly struct DummyAction : IAction
-        {
-            /// <inheritdoc/>
-            public void Invoke(int i)
-            {
-            }
-        }
-
-        /// <summary>
-        /// A dummy type implementing <see cref="IAction2D"/>
-        /// </summary>
-        private readonly struct DummyAction2D : IAction2D
-        {
-            /// <inheritdoc/>
-            public void Invoke(int i, int j)
-            {
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Memory2D{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Memory2D{T}.cs
deleted file mode 100644
index 5cdc09656af..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Memory2D{T}.cs
+++ /dev/null
@@ -1,543 +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.CodeAnalysis;
-#if !WINDOWS_UWP
-using System.Runtime.CompilerServices;
-#endif
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_Memory2DT
-    {
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_Empty()
-        {
-            // Create a few empty Memory2D<T> instances in different ways and
-            // check to ensure the right parameters were used to initialize them.
-            Memory2D<int> empty1 = default;
-
-            Assert.IsTrue(empty1.IsEmpty);
-            Assert.AreEqual(empty1.Length, 0);
-            Assert.AreEqual(empty1.Width, 0);
-            Assert.AreEqual(empty1.Height, 0);
-
-            Memory2D<string> empty2 = Memory2D<string>.Empty;
-
-            Assert.IsTrue(empty2.IsEmpty);
-            Assert.AreEqual(empty2.Length, 0);
-            Assert.AreEqual(empty2.Width, 0);
-            Assert.AreEqual(empty2.Height, 0);
-
-            Memory2D<int> empty3 = new int[4, 0];
-
-            Assert.IsTrue(empty3.IsEmpty);
-            Assert.AreEqual(empty3.Length, 0);
-            Assert.AreEqual(empty3.Width, 0);
-            Assert.AreEqual(empty3.Height, 4);
-
-            Memory2D<int> empty4 = new int[0, 7];
-
-            Assert.IsTrue(empty4.IsEmpty);
-            Assert.AreEqual(empty4.Length, 0);
-            Assert.AreEqual(empty4.Width, 7);
-            Assert.AreEqual(empty4.Height, 0);
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_Array1DConstructor()
-        {
-            int[] array =
-            {
-                1, 2, 3, 4, 5, 6
-            };
-
-            // Create a memory over a 1D array with 2D data in row-major order. This tests
-            // the T[] array constructor for Memory2D<T> with custom size and pitch.
-            Memory2D<int> memory2d = new Memory2D<int>(array, 1, 2, 2, 1);
-
-            Assert.IsFalse(memory2d.IsEmpty);
-            Assert.AreEqual(memory2d.Length, 4);
-            Assert.AreEqual(memory2d.Width, 2);
-            Assert.AreEqual(memory2d.Height, 2);
-            Assert.AreEqual(memory2d.Span[0, 0], 2);
-            Assert.AreEqual(memory2d.Span[1, 1], 6);
-
-            // Also ensure the right exceptions are thrown with invalid parameters, such as
-            // negative indices, indices out of range, values that are too big, etc.
-            Assert.ThrowsException<ArrayTypeMismatchException>(() => new Memory2D<object>(new string[1], 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, -99, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 0, -10, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 0, 1, 1, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 0, 1, -100, 1));
-            Assert.ThrowsException<ArgumentException>(() => new Memory2D<int>(array, 0, 2, 4, 0));
-            Assert.ThrowsException<ArgumentException>(() => new Memory2D<int>(array, 0, 3, 3, 0));
-            Assert.ThrowsException<ArgumentException>(() => new Memory2D<int>(array, 1, 2, 3, 0));
-            Assert.ThrowsException<ArgumentException>(() => new Memory2D<int>(array, 0, 10, 1, 120));
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_Array2DConstructor_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Test the constructor taking a T[,] array that is mapped directly (no slicing)
-            Memory2D<int> memory2d = new Memory2D<int>(array);
-
-            Assert.IsFalse(memory2d.IsEmpty);
-            Assert.AreEqual(memory2d.Length, 6);
-            Assert.AreEqual(memory2d.Width, 3);
-            Assert.AreEqual(memory2d.Height, 2);
-            Assert.AreEqual(memory2d.Span[0, 1], 2);
-            Assert.AreEqual(memory2d.Span[1, 2], 6);
-
-            // Here we test the check for covariance: we can't create a Memory2D<T> from a U[,] array
-            // where U is assignable to T (as in, U : T). This would cause a type safety violation on write.
-            Assert.ThrowsException<ArrayTypeMismatchException>(() => new Memory2D<object>(new string[1, 2]));
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_Array2DConstructor_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Same as above, but this time we also slice the memory to test the other constructor
-            Memory2D<int> memory2d = new Memory2D<int>(array, 0, 1, 2, 2);
-
-            Assert.IsFalse(memory2d.IsEmpty);
-            Assert.AreEqual(memory2d.Length, 4);
-            Assert.AreEqual(memory2d.Width, 2);
-            Assert.AreEqual(memory2d.Height, 2);
-            Assert.AreEqual(memory2d.Span[0, 0], 2);
-            Assert.AreEqual(memory2d.Span[1, 1], 6);
-
-            Assert.ThrowsException<ArrayTypeMismatchException>(() => new Memory2D<object>(new string[1, 2], 0, 0, 2, 2));
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_Array3DConstructor_1()
-        {
-            int[,,] array =
-            {
-                {
-                    { 1, 2, 3 },
-                    { 4, 5, 6 }
-                },
-                {
-                    { 10, 20, 30 },
-                    { 40, 50, 60 }
-                }
-            };
-
-            // Same as above, but we test the constructor taking a layer within a 3D array
-            Memory2D<int> memory2d = new Memory2D<int>(array, 1);
-
-            Assert.IsFalse(memory2d.IsEmpty);
-            Assert.AreEqual(memory2d.Length, 6);
-            Assert.AreEqual(memory2d.Width, 3);
-            Assert.AreEqual(memory2d.Height, 2);
-            Assert.AreEqual(memory2d.Span[0, 1], 20);
-            Assert.AreEqual(memory2d.Span[1, 2], 60);
-
-            // A couple of tests for invalid parameters, ie. layers out of range
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 2));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 20));
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_Array3DConstructor_2()
-        {
-            int[,,] array =
-            {
-                {
-                    { 1, 2, 3 },
-                    { 4, 5, 6 }
-                },
-                {
-                    { 10, 20, 30 },
-                    { 40, 50, 60 }
-                }
-            };
-
-            // Same as above, but we also slice the target layer in the 3D array. In this case we're creating
-            // a Memory<int> instance from a slice in the layer at depth 1 in our 3D array, and with an area
-            // starting at coorsinates (0, 1), with a height of 2 and width of 2. So we want to wrap the
-            // square with items [20, 30, 50, 60] in the second layer of the 3D array above.
-            Memory2D<int> memory2d = new Memory2D<int>(array, 1, 0, 1, 2, 2);
-
-            Assert.IsFalse(memory2d.IsEmpty);
-            Assert.AreEqual(memory2d.Length, 4);
-            Assert.AreEqual(memory2d.Width, 2);
-            Assert.AreEqual(memory2d.Height, 2);
-            Assert.AreEqual(memory2d.Span[0, 0], 20);
-            Assert.AreEqual(memory2d.Span[1, 1], 60);
-
-            // Same as above, testing a few cases with invalid parameters
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, -1, 1, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 1, -1, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 1, 1, -1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 1, 1, 1, -1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 1, 1, 1, 1, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 2, 0, 0, 2, 3));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 0, 0, 1, 2, 3));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 0, 0, 0, 2, 4));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array, 0, 0, 0, 3, 3));
-        }
-
-#if !WINDOWS_UWP
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_MemoryConstructor()
-        {
-            Memory<int> memory = new[]
-            {
-                1, 2, 3, 4, 5, 6
-            };
-
-            // We also test the constructor that takes an input Memory<T> instance.
-            // This is only available on runtimes with fast Span<T> support, as otherwise
-            // the implementation would be too complex and slow to work in this case.
-            // Conceptually, this works the same as when wrapping a 1D array with row-major items.
-            Memory2D<int> memory2d = memory.AsMemory2D(1, 2, 2, 1);
-
-            Assert.IsFalse(memory2d.IsEmpty);
-            Assert.AreEqual(memory2d.Length, 4);
-            Assert.AreEqual(memory2d.Width, 2);
-            Assert.AreEqual(memory2d.Height, 2);
-            Assert.AreEqual(memory2d.Span[0, 0], 2);
-            Assert.AreEqual(memory2d.Span[1, 1], 6);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => memory.AsMemory2D(-99, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => memory.AsMemory2D(0, -10, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => memory.AsMemory2D(0, 1, 1, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => memory.AsMemory2D(0, 1, -100, 1));
-            Assert.ThrowsException<ArgumentException>(() => memory.AsMemory2D(0, 2, 4, 0));
-            Assert.ThrowsException<ArgumentException>(() => memory.AsMemory2D(0, 3, 3, 0));
-            Assert.ThrowsException<ArgumentException>(() => memory.AsMemory2D(1, 2, 3, 0));
-            Assert.ThrowsException<ArgumentException>(() => memory.AsMemory2D(0, 10, 1, 120));
-        }
-#endif
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_Slice_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Memory2D<int> memory2d = new Memory2D<int>(array);
-
-            // Test a slice from a Memory2D<T> with valid parameters
-            Memory2D<int> slice1 = memory2d.Slice(1, 1, 1, 2);
-
-            Assert.AreEqual(slice1.Length, 2);
-            Assert.AreEqual(slice1.Height, 1);
-            Assert.AreEqual(slice1.Width, 2);
-            Assert.AreEqual(slice1.Span[0, 0], 5);
-            Assert.AreEqual(slice1.Span[0, 1], 6);
-
-            // Same above, but we test slicing a pre-sliced instance as well. This
-            // is done to verify that the internal offsets are properly tracked
-            // across multiple slicing operations, instead of just in the first.
-            Memory2D<int> slice2 = memory2d.Slice(0, 1, 2, 2);
-
-            Assert.AreEqual(slice2.Length, 4);
-            Assert.AreEqual(slice2.Height, 2);
-            Assert.AreEqual(slice2.Width, 2);
-            Assert.AreEqual(slice2.Span[0, 0], 2);
-            Assert.AreEqual(slice2.Span[1, 0], 5);
-            Assert.AreEqual(slice2.Span[1, 1], 6);
-
-            // A few invalid slicing operations, with out of range parameters
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array).Slice(-1, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array).Slice(1, -1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array).Slice(1, 1, 1, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array).Slice(1, 1, -1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array).Slice(10, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array).Slice(1, 12, 1, 12));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array).Slice(1, 1, 55, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array).Slice(0, 0, 2, 4));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array).Slice(0, 0, 3, 3));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array).Slice(0, 1, 2, 3));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Memory2D<int>(array).Slice(1, 0, 2, 3));
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_Slice_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Memory2D<int> memory2d = new Memory2D<int>(array);
-
-            // Mostly the same test as above, just with different parameters
-            Memory2D<int> slice1 = memory2d.Slice(0, 0, 2, 2);
-
-            Assert.AreEqual(slice1.Length, 4);
-            Assert.AreEqual(slice1.Height, 2);
-            Assert.AreEqual(slice1.Width, 2);
-            Assert.AreEqual(slice1.Span[0, 0], 1);
-            Assert.AreEqual(slice1.Span[1, 1], 5);
-
-            Memory2D<int> slice2 = slice1.Slice(1, 0, 1, 2);
-
-            Assert.AreEqual(slice2.Length, 2);
-            Assert.AreEqual(slice2.Height, 1);
-            Assert.AreEqual(slice2.Width, 2);
-            Assert.AreEqual(slice2.Span[0, 0], 4);
-            Assert.AreEqual(slice2.Span[0, 1], 5);
-
-            Memory2D<int> slice3 = slice2.Slice(0, 1, 1, 1);
-
-            Assert.AreEqual(slice3.Length, 1);
-            Assert.AreEqual(slice3.Height, 1);
-            Assert.AreEqual(slice3.Width, 1);
-            Assert.AreEqual(slice3.Span[0, 0], 5);
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_TryGetMemory_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Memory2D<int> memory2d = new Memory2D<int>(array);
-
-            // Here we test that we can get a Memory<T> from a 2D one when the underlying
-            // data is contiguous. Note that in this case this can only work on runtimes
-            // with fast Span<T> support, because otherwise it's not possible to get a
-            // Memory<T> (or a Span<T> too, for that matter) from a 2D array.
-            bool success = memory2d.TryGetMemory(out Memory<int> memory);
-
-#if WINDOWS_UWP
-            Assert.IsFalse(success);
-            Assert.IsTrue(memory.IsEmpty);
-#else
-            Assert.IsTrue(success);
-            Assert.AreEqual(memory.Length, array.Length);
-            Assert.IsTrue(Unsafe.AreSame(ref array[0, 0], ref memory.Span[0]));
-#endif
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_TryGetMemory_2()
-        {
-            int[] array = { 1, 2, 3, 4 };
-
-            Memory2D<int> memory2d = new Memory2D<int>(array, 2, 2);
-
-            // Same test as above, but this will always succeed on all runtimes,
-            // as creating a Memory<T> from a 1D array is always supported.
-            bool success = memory2d.TryGetMemory(out Memory<int> memory);
-
-            Assert.IsTrue(success);
-            Assert.AreEqual(memory.Length, array.Length);
-            Assert.AreEqual(memory.Span[2], 3);
-        }
-
-#if !WINDOWS_UWP
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_TryGetMemory_3()
-        {
-            Memory<int> data = new[] { 1, 2, 3, 4 };
-
-            Memory2D<int> memory2d = data.AsMemory2D(2, 2);
-
-            // Same as above, just with the extra Memory<T> indirection. Same as above,
-            // this test is only supported on runtimes with fast Span<T> support.
-            // On others, we just don't expose the Memory<T>.AsMemory2D extension.
-            bool success = memory2d.TryGetMemory(out Memory<int> memory);
-
-            Assert.IsTrue(success);
-            Assert.AreEqual(memory.Length, data.Length);
-            Assert.AreEqual(memory.Span[2], 3);
-        }
-#endif
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public unsafe void Test_Memory2DT_Pin_1()
-        {
-            int[] array = { 1, 2, 3, 4 };
-
-            // We create a Memory2D<T> from an array and verify that pinning this
-            // instance correctly returns a pointer to the right array element.
-            Memory2D<int> memory2d = new Memory2D<int>(array, 2, 2);
-
-            using var pin = memory2d.Pin();
-
-            Assert.AreEqual(((int*)pin.Pointer)[0], 1);
-            Assert.AreEqual(((int*)pin.Pointer)[3], 4);
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public unsafe void Test_Memory2DT_Pin_2()
-        {
-            int[] array = { 1, 2, 3, 4 };
-
-            // Same as above, but we test with a sliced Memory2D<T> instance
-            Memory2D<int> memory2d = new Memory2D<int>(array, 2, 2);
-
-            using var pin = memory2d.Pin();
-
-            Assert.AreEqual(((int*)pin.Pointer)[0], 1);
-            Assert.AreEqual(((int*)pin.Pointer)[3], 4);
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_ToArray_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Here we create a Memory2D<T> instance from a 2D array and then verify that
-            // calling ToArray() creates an array that matches the contents of the first.
-            Memory2D<int> memory2d = new Memory2D<int>(array);
-
-            int[,] copy = memory2d.ToArray();
-
-            Assert.AreEqual(copy.GetLength(0), array.GetLength(0));
-            Assert.AreEqual(copy.GetLength(1), array.GetLength(1));
-
-            CollectionAssert.AreEqual(array, copy);
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_ToArray_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Same as above, but with a sliced Memory2D<T> instance
-            Memory2D<int> memory2d = new Memory2D<int>(array, 0, 0, 2, 2);
-
-            int[,] copy = memory2d.ToArray();
-
-            Assert.AreEqual(copy.GetLength(0), 2);
-            Assert.AreEqual(copy.GetLength(1), 2);
-
-            int[,] expected =
-            {
-                { 1, 2 },
-                { 4, 5 }
-            };
-
-            CollectionAssert.AreEqual(expected, copy);
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_Equals()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Here we want to verify that the Memory2D<T>.Equals method works correctly. This is true
-            // when the wrapped instance is the same, and the various internal offsets and sizes match.
-            Memory2D<int> memory2d = new Memory2D<int>(array);
-
-            Assert.IsFalse(memory2d.Equals(null));
-            Assert.IsFalse(memory2d.Equals(new Memory2D<int>(array, 0, 1, 2, 2)));
-            Assert.IsTrue(memory2d.Equals(new Memory2D<int>(array)));
-            Assert.IsTrue(memory2d.Equals(memory2d));
-
-            // This should work also when casting to a ReadOnlyMemory2D<T> instance
-            ReadOnlyMemory2D<int> readOnlyMemory2d = memory2d;
-
-            Assert.IsTrue(memory2d.Equals(readOnlyMemory2d));
-            Assert.IsFalse(memory2d.Equals(readOnlyMemory2d.Slice(0, 1, 2, 2)));
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_GetHashCode()
-        {
-            // An emoty Memory2D<T> has just 0 as the hashcode
-            Assert.AreEqual(Memory2D<int>.Empty.GetHashCode(), 0);
-
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Memory2D<int> memory2d = new Memory2D<int>(array);
-
-            // Ensure that the GetHashCode method is repeatable
-            int a = memory2d.GetHashCode(), b = memory2d.GetHashCode();
-
-            Assert.AreEqual(a, b);
-
-            // The hashcode shouldn't match when the size is different
-            int c = new Memory2D<int>(array, 0, 1, 2, 2).GetHashCode();
-
-            Assert.AreNotEqual(a, c);
-        }
-
-        [TestCategory("Memory2DT")]
-        [TestMethod]
-        public void Test_Memory2DT_ToString()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Memory2D<int> memory2d = new Memory2D<int>(array);
-
-            // Here we just want to verify that the type is nicely printed as expected, along with the size
-            string text = memory2d.ToString();
-
-            const string expected = "Microsoft.Toolkit.HighPerformance.Memory2D<System.Int32>[2, 3]";
-
-            Assert.AreEqual(text, expected);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlyMemory2D{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlyMemory2D{T}.cs
deleted file mode 100644
index ab9311f4aa6..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlyMemory2D{T}.cs
+++ /dev/null
@@ -1,491 +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.CodeAnalysis;
-#if !WINDOWS_UWP
-using System.Runtime.CompilerServices;
-#endif
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance
-{
-    /* ====================================================================
-    *                                 NOTE
-    * ====================================================================
-    * All the tests here mirror the ones for Memory2D<T>, as the two types
-    * are basically the same except for some small differences in return types
-    * or some checks being done upon construction. See comments in the test
-    * file for Memory2D<T> for more info on these tests. */
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_ReadOnlyMemory2DT
-    {
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_Empty()
-        {
-            ReadOnlyMemory2D<int> empty1 = default;
-
-            Assert.IsTrue(empty1.IsEmpty);
-            Assert.AreEqual(empty1.Length, 0);
-            Assert.AreEqual(empty1.Width, 0);
-            Assert.AreEqual(empty1.Height, 0);
-
-            ReadOnlyMemory2D<string> empty2 = ReadOnlyMemory2D<string>.Empty;
-
-            Assert.IsTrue(empty2.IsEmpty);
-            Assert.AreEqual(empty2.Length, 0);
-            Assert.AreEqual(empty2.Width, 0);
-            Assert.AreEqual(empty2.Height, 0);
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_Array1DConstructor()
-        {
-            int[] array =
-            {
-                1, 2, 3, 4, 5, 6
-            };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array, 1, 2, 2, 1);
-
-            Assert.IsFalse(memory2d.IsEmpty);
-            Assert.AreEqual(memory2d.Length, 4);
-            Assert.AreEqual(memory2d.Width, 2);
-            Assert.AreEqual(memory2d.Height, 2);
-            Assert.AreEqual(memory2d.Span[0, 0], 2);
-            Assert.AreEqual(memory2d.Span[1, 1], 6);
-
-            // Here we check to ensure a covariant array conversion is allowed for ReadOnlyMemory2D<T>
-            _ = new ReadOnlyMemory2D<object>(new string[1], 1, 1);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, -99, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 0, -10, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 0, 1, 1, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 0, 1, -100, 1));
-            Assert.ThrowsException<ArgumentException>(() => new ReadOnlyMemory2D<int>(array, 0, 2, 4, 0));
-            Assert.ThrowsException<ArgumentException>(() => new ReadOnlyMemory2D<int>(array, 0, 3, 3, 0));
-            Assert.ThrowsException<ArgumentException>(() => new ReadOnlyMemory2D<int>(array, 1, 2, 3, 0));
-            Assert.ThrowsException<ArgumentException>(() => new ReadOnlyMemory2D<int>(array, 0, 10, 1, 120));
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_Array2DConstructor_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array);
-
-            Assert.IsFalse(memory2d.IsEmpty);
-            Assert.AreEqual(memory2d.Length, 6);
-            Assert.AreEqual(memory2d.Width, 3);
-            Assert.AreEqual(memory2d.Height, 2);
-            Assert.AreEqual(memory2d.Span[0, 1], 2);
-            Assert.AreEqual(memory2d.Span[1, 2], 6);
-
-            _ = new ReadOnlyMemory2D<object>(new string[1, 2]);
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_Array2DConstructor_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array, 0, 1, 2, 2);
-
-            Assert.IsFalse(memory2d.IsEmpty);
-            Assert.AreEqual(memory2d.Length, 4);
-            Assert.AreEqual(memory2d.Width, 2);
-            Assert.AreEqual(memory2d.Height, 2);
-            Assert.AreEqual(memory2d.Span[0, 0], 2);
-            Assert.AreEqual(memory2d.Span[1, 1], 6);
-
-            _ = new ReadOnlyMemory2D<object>(new string[1, 2]);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<object>(new string[1, 2], 0, 0, 2, 2));
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_Array3DConstructor_1()
-        {
-            int[,,] array =
-            {
-                {
-                    { 1, 2, 3 },
-                    { 4, 5, 6 }
-                },
-                {
-                    { 10, 20, 30 },
-                    { 40, 50, 60 }
-                }
-            };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array, 1);
-
-            Assert.IsFalse(memory2d.IsEmpty);
-            Assert.AreEqual(memory2d.Length, 6);
-            Assert.AreEqual(memory2d.Width, 3);
-            Assert.AreEqual(memory2d.Height, 2);
-            Assert.AreEqual(memory2d.Span[0, 1], 20);
-            Assert.AreEqual(memory2d.Span[1, 2], 60);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 20));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 2));
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_Array3DConstructor_2()
-        {
-            int[,,] array =
-            {
-                {
-                    { 1, 2, 3 },
-                    { 4, 5, 6 }
-                },
-                {
-                    { 10, 20, 30 },
-                    { 40, 50, 60 }
-                }
-            };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array, 1, 0, 1, 2, 2);
-
-            Assert.IsFalse(memory2d.IsEmpty);
-            Assert.AreEqual(memory2d.Length, 4);
-            Assert.AreEqual(memory2d.Width, 2);
-            Assert.AreEqual(memory2d.Height, 2);
-            Assert.AreEqual(memory2d.Span[0, 0], 20);
-            Assert.AreEqual(memory2d.Span[1, 1], 60);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, -1, 1, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 1, -1, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 1, 1, -1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 1, 1, 1, -1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 1, 1, 1, 1, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 2, 0, 0, 2, 3));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 0, 0, 1, 2, 3));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 0, 0, 0, 2, 4));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array, 0, 0, 0, 3, 3));
-        }
-
-#if !WINDOWS_UWP
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_ReadOnlyMemoryConstructor()
-        {
-            ReadOnlyMemory<int> memory = new[]
-            {
-                1, 2, 3, 4, 5, 6
-            };
-
-            ReadOnlyMemory2D<int> memory2d = memory.AsMemory2D(1, 2, 2, 1);
-
-            Assert.IsFalse(memory2d.IsEmpty);
-            Assert.AreEqual(memory2d.Length, 4);
-            Assert.AreEqual(memory2d.Width, 2);
-            Assert.AreEqual(memory2d.Height, 2);
-            Assert.AreEqual(memory2d.Span[0, 0], 2);
-            Assert.AreEqual(memory2d.Span[1, 1], 6);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => memory.AsMemory2D(-99, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => memory.AsMemory2D(0, -10, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => memory.AsMemory2D(0, 1, 1, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => memory.AsMemory2D(0, 1, -100, 1));
-            Assert.ThrowsException<ArgumentException>(() => memory.AsMemory2D(0, 2, 4, 0));
-            Assert.ThrowsException<ArgumentException>(() => memory.AsMemory2D(0, 3, 3, 0));
-            Assert.ThrowsException<ArgumentException>(() => memory.AsMemory2D(1, 2, 3, 0));
-            Assert.ThrowsException<ArgumentException>(() => memory.AsMemory2D(0, 10, 1, 120));
-        }
-#endif
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_Slice_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array);
-
-            ReadOnlyMemory2D<int> slice1 = memory2d.Slice(1, 1, 1, 2);
-
-            Assert.AreEqual(slice1.Length, 2);
-            Assert.AreEqual(slice1.Height, 1);
-            Assert.AreEqual(slice1.Width, 2);
-            Assert.AreEqual(slice1.Span[0, 0], 5);
-            Assert.AreEqual(slice1.Span[0, 1], 6);
-
-            ReadOnlyMemory2D<int> slice2 = memory2d.Slice(0, 1, 2, 2);
-
-            Assert.AreEqual(slice2.Length, 4);
-            Assert.AreEqual(slice2.Height, 2);
-            Assert.AreEqual(slice2.Width, 2);
-            Assert.AreEqual(slice2.Span[0, 0], 2);
-            Assert.AreEqual(slice2.Span[1, 0], 5);
-            Assert.AreEqual(slice2.Span[1, 1], 6);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array).Slice(-1, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array).Slice(1, -1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array).Slice(1, 1, 1, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array).Slice(1, 1, -1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array).Slice(10, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array).Slice(1, 12, 1, 12));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array).Slice(1, 1, 55, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array).Slice(0, 0, 2, 4));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array).Slice(0, 0, 3, 3));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array).Slice(0, 1, 2, 3));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlyMemory2D<int>(array).Slice(1, 0, 2, 3));
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_Slice_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array);
-
-            ReadOnlyMemory2D<int> slice1 = memory2d.Slice(0, 0, 2, 2);
-
-            Assert.AreEqual(slice1.Length, 4);
-            Assert.AreEqual(slice1.Height, 2);
-            Assert.AreEqual(slice1.Width, 2);
-            Assert.AreEqual(slice1.Span[0, 0], 1);
-            Assert.AreEqual(slice1.Span[1, 1], 5);
-
-            ReadOnlyMemory2D<int> slice2 = slice1.Slice(1, 0, 1, 2);
-
-            Assert.AreEqual(slice2.Length, 2);
-            Assert.AreEqual(slice2.Height, 1);
-            Assert.AreEqual(slice2.Width, 2);
-            Assert.AreEqual(slice2.Span[0, 0], 4);
-            Assert.AreEqual(slice2.Span[0, 1], 5);
-
-            ReadOnlyMemory2D<int> slice3 = slice2.Slice(0, 1, 1, 1);
-
-            Assert.AreEqual(slice3.Length, 1);
-            Assert.AreEqual(slice3.Height, 1);
-            Assert.AreEqual(slice3.Width, 1);
-            Assert.AreEqual(slice3.Span[0, 0], 5);
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_TryGetReadOnlyMemory_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array);
-
-            bool success = memory2d.TryGetMemory(out ReadOnlyMemory<int> memory);
-
-#if WINDOWS_UWP
-            Assert.IsFalse(success);
-            Assert.IsTrue(memory.IsEmpty);
-#else
-            Assert.IsTrue(success);
-            Assert.AreEqual(memory.Length, array.Length);
-            Assert.IsTrue(Unsafe.AreSame(ref array[0, 0], ref Unsafe.AsRef(memory.Span[0])));
-#endif
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_TryGetReadOnlyMemory_2()
-        {
-            int[] array = { 1, 2, 3, 4 };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array, 2, 2);
-
-            bool success = memory2d.TryGetMemory(out ReadOnlyMemory<int> memory);
-
-            Assert.IsTrue(success);
-            Assert.AreEqual(memory.Length, array.Length);
-            Assert.AreEqual(memory.Span[2], 3);
-        }
-
-#if !WINDOWS_UWP
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_TryGetReadOnlyMemory_3()
-        {
-            ReadOnlyMemory<int> data = new[] { 1, 2, 3, 4 };
-
-            ReadOnlyMemory2D<int> memory2d = data.AsMemory2D(2, 2);
-
-            bool success = memory2d.TryGetMemory(out ReadOnlyMemory<int> memory);
-
-            Assert.IsTrue(success);
-            Assert.AreEqual(memory.Length, data.Length);
-            Assert.AreEqual(memory.Span[2], 3);
-        }
-#endif
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public unsafe void Test_ReadOnlyMemory2DT_Pin_1()
-        {
-            int[] array = { 1, 2, 3, 4 };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array, 2, 2);
-
-            using var pin = memory2d.Pin();
-
-            Assert.AreEqual(((int*)pin.Pointer)[0], 1);
-            Assert.AreEqual(((int*)pin.Pointer)[3], 4);
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public unsafe void Test_ReadOnlyMemory2DT_Pin_2()
-        {
-            int[] array = { 1, 2, 3, 4 };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array, 2, 2);
-
-            using var pin = memory2d.Pin();
-
-            Assert.AreEqual(((int*)pin.Pointer)[0], 1);
-            Assert.AreEqual(((int*)pin.Pointer)[3], 4);
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_ToArray_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array);
-
-            int[,] copy = memory2d.ToArray();
-
-            Assert.AreEqual(copy.GetLength(0), array.GetLength(0));
-            Assert.AreEqual(copy.GetLength(1), array.GetLength(1));
-
-            CollectionAssert.AreEqual(array, copy);
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_ToArray_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array, 0, 0, 2, 2);
-
-            int[,] copy = memory2d.ToArray();
-
-            Assert.AreEqual(copy.GetLength(0), 2);
-            Assert.AreEqual(copy.GetLength(1), 2);
-
-            int[,] expected =
-            {
-                { 1, 2 },
-                { 4, 5 }
-            };
-
-            CollectionAssert.AreEqual(expected, copy);
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_Equals()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlyMemory2D<int> readOnlyMemory2D = new ReadOnlyMemory2D<int>(array);
-
-            Assert.IsFalse(readOnlyMemory2D.Equals(null));
-            Assert.IsFalse(readOnlyMemory2D.Equals(new ReadOnlyMemory2D<int>(array, 0, 1, 2, 2)));
-            Assert.IsTrue(readOnlyMemory2D.Equals(new ReadOnlyMemory2D<int>(array)));
-            Assert.IsTrue(readOnlyMemory2D.Equals(readOnlyMemory2D));
-
-            Memory2D<int> memory2d = array;
-
-            Assert.IsTrue(readOnlyMemory2D.Equals((object)memory2d));
-            Assert.IsFalse(readOnlyMemory2D.Equals((object)memory2d.Slice(0, 1, 2, 2)));
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_GetHashCode()
-        {
-            Assert.AreEqual(ReadOnlyMemory2D<int>.Empty.GetHashCode(), 0);
-
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array);
-
-            int a = memory2d.GetHashCode(), b = memory2d.GetHashCode();
-
-            Assert.AreEqual(a, b);
-
-            int c = new ReadOnlyMemory2D<int>(array, 0, 1, 2, 2).GetHashCode();
-
-            Assert.AreNotEqual(a, c);
-        }
-
-        [TestCategory("ReadOnlyMemory2DT")]
-        [TestMethod]
-        public void Test_ReadOnlyMemory2DT_ToString()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlyMemory2D<int> memory2d = new ReadOnlyMemory2D<int>(array);
-
-            string text = memory2d.ToString();
-
-            const string expected = "Microsoft.Toolkit.HighPerformance.ReadOnlyMemory2D<System.Int32>[2, 3]";
-
-            Assert.AreEqual(text, expected);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlySpan2D{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlySpan2D{T}.cs
deleted file mode 100644
index fca5819b8f9..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_ReadOnlySpan2D{T}.cs
+++ /dev/null
@@ -1,1050 +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.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.Toolkit.HighPerformance.Enumerables;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance
-{
-    /* ====================================================================
-    *                                 NOTE
-    * ====================================================================
-    * All the tests here mirror the ones for ReadOnlySpan2D<T>. See comments
-    * in the test file for Span2D<T> for more info on these tests. */
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_ReadOnlySpan2DT
-    {
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_Empty()
-        {
-            ReadOnlySpan2D<int> empty1 = default;
-
-            Assert.IsTrue(empty1.IsEmpty);
-            Assert.AreEqual(empty1.Length, 0);
-            Assert.AreEqual(empty1.Width, 0);
-            Assert.AreEqual(empty1.Height, 0);
-
-            ReadOnlySpan2D<string> empty2 = ReadOnlySpan2D<string>.Empty;
-
-            Assert.IsTrue(empty2.IsEmpty);
-            Assert.AreEqual(empty2.Length, 0);
-            Assert.AreEqual(empty2.Width, 0);
-            Assert.AreEqual(empty2.Height, 0);
-        }
-
-#if !WINDOWS_UWP
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public unsafe void Test_ReadOnlySpan2DT_RefConstructor()
-        {
-            ReadOnlySpan<int> span = stackalloc[]
-            {
-                1, 2, 3, 4, 5, 6
-            };
-
-            ReadOnlySpan2D<int> span2d = ReadOnlySpan2D<int>.DangerousCreate(span[0], 2, 3, 0);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 6);
-            Assert.AreEqual(span2d.Width, 3);
-            Assert.AreEqual(span2d.Height, 2);
-            Assert.AreEqual(span2d[0, 0], 1);
-            Assert.AreEqual(span2d[1, 2], 6);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => ReadOnlySpan2D<int>.DangerousCreate(Unsafe.AsRef<int>(null), -1, 0, 0));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => ReadOnlySpan2D<int>.DangerousCreate(Unsafe.AsRef<int>(null), 1, -2, 0));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => ReadOnlySpan2D<int>.DangerousCreate(Unsafe.AsRef<int>(null), 1, 0, -5));
-        }
-#endif
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public unsafe void Test_ReadOnlySpan2DT_PtrConstructor()
-        {
-            int* ptr = stackalloc[]
-            {
-                1,
-                2,
-                3,
-                4,
-                5,
-                6
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(ptr, 2, 3, 0);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 6);
-            Assert.AreEqual(span2d.Width, 3);
-            Assert.AreEqual(span2d.Height, 2);
-            Assert.AreEqual(span2d[0, 0], 1);
-            Assert.AreEqual(span2d[1, 2], 6);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>((void*)0, -1, 0, 0));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>((void*)0, 1, -2, 0));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>((void*)0, 1, 0, -5));
-            Assert.ThrowsException<ArgumentException>(() => new ReadOnlySpan2D<string>((void*)0, 2, 2, 0));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_Array1DConstructor()
-        {
-            int[] array =
-            {
-                1, 2, 3, 4, 5, 6
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array, 1, 2, 2, 1);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 4);
-            Assert.AreEqual(span2d.Width, 2);
-            Assert.AreEqual(span2d.Height, 2);
-            Assert.AreEqual(span2d[0, 0], 2);
-            Assert.AreEqual(span2d[1, 1], 6);
-
-            // Same for ReadOnlyMemory2D<T>, we need to check that covariant array conversions are allowed
-            _ = new ReadOnlySpan2D<object>(new string[1], 1, 1);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, -99, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 0, -10, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 0, 1, 1, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 0, 1, -100, 1));
-            Assert.ThrowsException<ArgumentException>(() => new ReadOnlySpan2D<int>(array, 0, 10, 1, 120));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_Array2DConstructor_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 6);
-            Assert.AreEqual(span2d.Width, 3);
-            Assert.AreEqual(span2d.Height, 2);
-            Assert.AreEqual(span2d[0, 1], 2);
-            Assert.AreEqual(span2d[1, 2], 6);
-
-            _ = new ReadOnlySpan2D<object>(new string[1, 2]);
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_Array2DConstructor_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array, 0, 1, 2, 2);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 4);
-            Assert.AreEqual(span2d.Width, 2);
-            Assert.AreEqual(span2d.Height, 2);
-            Assert.AreEqual(span2d[0, 0], 2);
-            Assert.AreEqual(span2d[1, 1], 6);
-
-            _ = new ReadOnlySpan2D<object>(new string[1, 2]);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<object>(new string[1, 2], 0, 0, 2, 2));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_Array3DConstructor_1()
-        {
-            int[,,] array =
-            {
-                {
-                    { 1, 2, 3 },
-                    { 4, 5, 6 }
-                },
-                {
-                    { 10, 20, 30 },
-                    { 40, 50, 60 }
-                }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array, 1);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 6);
-            Assert.AreEqual(span2d.Width, 3);
-            Assert.AreEqual(span2d.Height, 2);
-            Assert.AreEqual(span2d[0, 0], 10);
-            Assert.AreEqual(span2d[0, 1], 20);
-            Assert.AreEqual(span2d[1, 2], 60);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 20));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_Array3DConstructor_2()
-        {
-            int[,,] array =
-            {
-                {
-                    { 1, 2, 3 },
-                    { 4, 5, 6 }
-                },
-                {
-                    { 10, 20, 30 },
-                    { 40, 50, 60 }
-                }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array, 1, 0, 1, 2, 2);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 4);
-            Assert.AreEqual(span2d.Width, 2);
-            Assert.AreEqual(span2d.Height, 2);
-            Assert.AreEqual(span2d[0, 0], 20);
-            Assert.AreEqual(span2d[0, 1], 30);
-            Assert.AreEqual(span2d[1, 1], 60);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, -1, 1, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 1, -1, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 1, 1, -1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 1, 1, 1, -1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 1, 1, 1, 1, -1));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_CopyTo_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            int[] target = new int[array.Length];
-
-            span2d.CopyTo(target);
-
-            CollectionAssert.AreEqual(array, target);
-
-            Assert.ThrowsException<ArgumentException>(() => new ReadOnlySpan2D<int>(array).CopyTo(Span<int>.Empty));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_CopyTo_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array, 0, 1, 2, 2);
-
-            int[] target = new int[4];
-
-            span2d.CopyTo(target);
-
-            int[] expected = { 2, 3, 5, 6 };
-
-            CollectionAssert.AreEqual(target, expected);
-
-            Assert.ThrowsException<ArgumentException>(() => new ReadOnlySpan2D<int>(array).CopyTo(Span<int>.Empty));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_CopyTo2D_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            int[,] target = new int[2, 3];
-
-            span2d.CopyTo(target);
-
-            CollectionAssert.AreEqual(array, target);
-
-            Assert.ThrowsException<ArgumentException>(() => new ReadOnlySpan2D<int>(array).CopyTo(Span2D<int>.Empty));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_CopyTo2D_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array, 0, 1, 2, 2);
-
-            int[,] target = new int[2, 2];
-
-            span2d.CopyTo(target);
-
-            int[,] expected =
-            {
-                { 2, 3 },
-                { 5, 6 }
-            };
-
-            CollectionAssert.AreEqual(target, expected);
-
-            Assert.ThrowsException<ArgumentException>(() => new ReadOnlySpan2D<int>(array).CopyTo(new Span2D<int>(target)));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_TryCopyTo()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            int[] target = new int[array.Length];
-
-            Assert.IsTrue(span2d.TryCopyTo(target));
-            Assert.IsFalse(span2d.TryCopyTo(Span<int>.Empty));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_TryCopyTo2D()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            int[,] target = new int[2, 3];
-
-            Assert.IsTrue(span2d.TryCopyTo(target));
-            Assert.IsFalse(span2d.TryCopyTo(Span2D<int>.Empty));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public unsafe void Test_ReadOnlySpan2DT_GetPinnableReference()
-        {
-            Assert.IsTrue(Unsafe.AreSame(
-                ref Unsafe.AsRef<int>(null),
-                ref ReadOnlySpan2D<int>.Empty.GetPinnableReference()));
-
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            ref int r0 = ref span2d.GetPinnableReference();
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref array[0, 0]));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public unsafe void Test_ReadOnlySpan2DT_DangerousGetReference()
-        {
-            Assert.IsTrue(Unsafe.AreSame(
-                ref Unsafe.AsRef<int>(null),
-                ref ReadOnlySpan2D<int>.Empty.DangerousGetReference()));
-
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            ref int r0 = ref span2d.DangerousGetReference();
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref array[0, 0]));
-        }
-
-#if NETCOREAPP3_1_OR_GREATER
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_ReadOnlySpan2DT_Index_Indexer_1()
-        {
-            int[,] array = new int[4, 4];
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            ref int arrayRef = ref array[1, 3];
-            ref readonly int span2dRef = ref span2d[1, ^1];
-
-            Assert.IsTrue(Unsafe.AreSame(ref arrayRef, ref Unsafe.AsRef(in span2dRef)));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_ReadOnlySpan2DT_Index_Indexer_2()
-        {
-            int[,] array = new int[4, 4];
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            ref int arrayRef = ref array[2, 1];
-            ref readonly int span2dRef = ref span2d[^2, ^3];
-
-            Assert.IsTrue(Unsafe.AreSame(ref arrayRef, ref Unsafe.AsRef(in span2dRef)));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        [ExpectedException(typeof(IndexOutOfRangeException))]
-        public unsafe void Test_ReadOnlySpan2DT_Index_Indexer_Fail()
-        {
-            int[,] array = new int[4, 4];
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            ref readonly int span2dRef = ref span2d[^6, 2];
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_ReadOnlySpan2DT_Range_Indexer_1()
-        {
-            int[,] array = new int[4, 4];
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-            ReadOnlySpan2D<int> slice = span2d[1.., 1..];
-
-            Assert.AreEqual(slice.Length, 9);
-            Assert.IsTrue(Unsafe.AreSame(ref array[1, 1], ref Unsafe.AsRef(in slice[0, 0])));
-            Assert.IsTrue(Unsafe.AreSame(ref array[3, 3], ref Unsafe.AsRef(in slice[2, 2])));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_ReadOnlySpan2DT_Range_Indexer_2()
-        {
-            int[,] array = new int[4, 4];
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-            ReadOnlySpan2D<int> slice = span2d[0..^2, 1..^1];
-
-            Assert.AreEqual(slice.Length, 4);
-            Assert.IsTrue(Unsafe.AreSame(ref array[0, 1], ref Unsafe.AsRef(in slice[0, 0])));
-            Assert.IsTrue(Unsafe.AreSame(ref array[1, 2], ref Unsafe.AsRef(in slice[1, 1])));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public unsafe void Test_ReadOnlySpan2DT_Range_Indexer_Fail()
-        {
-            int[,] array = new int[4, 4];
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-            _ = span2d[0..6, 2..^1];
-
-            Assert.Fail();
-        }
-#endif
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_Slice_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            ReadOnlySpan2D<int> slice1 = span2d.Slice(1, 1, 1, 2);
-
-            Assert.AreEqual(slice1.Length, 2);
-            Assert.AreEqual(slice1.Height, 1);
-            Assert.AreEqual(slice1.Width, 2);
-            Assert.AreEqual(slice1[0, 0], 5);
-            Assert.AreEqual(slice1[0, 1], 6);
-
-            ReadOnlySpan2D<int> slice2 = span2d.Slice(0, 1, 2, 2);
-
-            Assert.AreEqual(slice2.Length, 4);
-            Assert.AreEqual(slice2.Height, 2);
-            Assert.AreEqual(slice2.Width, 2);
-            Assert.AreEqual(slice2[0, 0], 2);
-            Assert.AreEqual(slice2[1, 0], 5);
-            Assert.AreEqual(slice2[1, 1], 6);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).Slice(-1, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).Slice(1, -1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).Slice(1, 1, 1, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).Slice(1, 1, -1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).Slice(10, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).Slice(1, 12, 1, 12));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).Slice(1, 1, 55, 1));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_Slice_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            ReadOnlySpan2D<int> slice1 = span2d.Slice(0, 0, 2, 2);
-
-            Assert.AreEqual(slice1.Length, 4);
-            Assert.AreEqual(slice1.Height, 2);
-            Assert.AreEqual(slice1.Width, 2);
-            Assert.AreEqual(slice1[0, 0], 1);
-            Assert.AreEqual(slice1[1, 1], 5);
-
-            ReadOnlySpan2D<int> slice2 = slice1.Slice(1, 0, 1, 2);
-
-            Assert.AreEqual(slice2.Length, 2);
-            Assert.AreEqual(slice2.Height, 1);
-            Assert.AreEqual(slice2.Width, 2);
-            Assert.AreEqual(slice2[0, 0], 4);
-            Assert.AreEqual(slice2[0, 1], 5);
-
-            ReadOnlySpan2D<int> slice3 = slice2.Slice(0, 1, 1, 1);
-
-            Assert.AreEqual(slice3.Length, 1);
-            Assert.AreEqual(slice3.Height, 1);
-            Assert.AreEqual(slice3.Width, 1);
-            Assert.AreEqual(slice3[0, 0], 5);
-        }
-
-#if !WINDOWS_UWP
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_GetRowReadOnlySpan()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            ReadOnlySpan<int> span = span2d.GetRowSpan(1);
-
-            Assert.IsTrue(Unsafe.AreSame(
-                ref Unsafe.AsRef(span[0]),
-                ref array[1, 0]));
-            Assert.IsTrue(Unsafe.AreSame(
-                ref Unsafe.AsRef(span[2]),
-                ref array[1, 2]));
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).GetRowSpan(-1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).GetRowSpan(5));
-        }
-#endif
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_TryGetSpan_From1DArray_1()
-        {
-            int[] array = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array, 3, 3);
-
-            bool success = span2d.TryGetSpan(out ReadOnlySpan<int> span);
-
-            Assert.IsTrue(success);
-            Assert.AreEqual(span.Length, span2d.Length);
-            Assert.IsTrue(Unsafe.AreSame(ref array[0], ref Unsafe.AsRef(in span[0])));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_TryGetSpan_From1DArray_2()
-        {
-            int[] array = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array, 3, 3).Slice(1, 0, 2, 3);
-
-            bool success = span2d.TryGetSpan(out ReadOnlySpan<int> span);
-
-            Assert.IsTrue(success);
-            Assert.AreEqual(span.Length, span2d.Length);
-            Assert.IsTrue(Unsafe.AreSame(ref array[3], ref Unsafe.AsRef(in span[0])));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_TryGetSpan_From1DArray_3()
-        {
-            int[] array = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array, 3, 3).Slice(0, 1, 3, 2);
-
-            bool success = span2d.TryGetSpan(out ReadOnlySpan<int> span);
-
-            Assert.IsFalse(success);
-            Assert.AreEqual(span.Length, 0);
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_TryGetReadOnlySpan_From2DArray_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            bool success = span2d.TryGetSpan(out ReadOnlySpan<int> span);
-
-#if WINDOWS_UWP
-            // Can't get a ReadOnlySpan<T> over a T[,] array on UWP
-            Assert.IsFalse(success);
-            Assert.AreEqual(span.Length, 0);
-#else
-            Assert.IsTrue(success);
-            Assert.AreEqual(span.Length, span2d.Length);
-#endif
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_TryGetReadOnlySpan_From2DArray_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array, 0, 0, 2, 2);
-
-            bool success = span2d.TryGetSpan(out ReadOnlySpan<int> span);
-
-            Assert.IsFalse(success);
-            Assert.IsTrue(span.IsEmpty);
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_ToArray_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            int[,] copy = span2d.ToArray();
-
-            Assert.AreEqual(copy.GetLength(0), array.GetLength(0));
-            Assert.AreEqual(copy.GetLength(1), array.GetLength(1));
-
-            CollectionAssert.AreEqual(array, copy);
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_ToArray_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array, 0, 0, 2, 2);
-
-            int[,] copy = span2d.ToArray();
-
-            Assert.AreEqual(copy.GetLength(0), 2);
-            Assert.AreEqual(copy.GetLength(1), 2);
-
-            int[,] expected =
-            {
-                { 1, 2 },
-                { 4, 5 }
-            };
-
-            CollectionAssert.AreEqual(expected, copy);
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        [ExpectedException(typeof(NotSupportedException))]
-        public void Test_ReadOnlySpan2DT_Equals()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            _ = span2d.Equals(null);
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        [ExpectedException(typeof(NotSupportedException))]
-        public void Test_ReadOnlySpan2DT_GetHashCode()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            _ = span2d.GetHashCode();
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_ToString()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d = new ReadOnlySpan2D<int>(array);
-
-            string text = span2d.ToString();
-
-            const string expected = "Microsoft.Toolkit.HighPerformance.ReadOnlySpan2D<System.Int32>[2, 3]";
-
-            Assert.AreEqual(text, expected);
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_opEquals()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d_1 = new ReadOnlySpan2D<int>(array);
-            ReadOnlySpan2D<int> span2d_2 = new ReadOnlySpan2D<int>(array);
-
-            Assert.IsTrue(span2d_1 == span2d_2);
-            Assert.IsFalse(span2d_1 == ReadOnlySpan2D<int>.Empty);
-            Assert.IsTrue(ReadOnlySpan2D<int>.Empty == ReadOnlySpan2D<int>.Empty);
-
-            ReadOnlySpan2D<int> span2d_3 = new ReadOnlySpan2D<int>(array, 0, 0, 2, 2);
-
-            Assert.IsFalse(span2d_1 == span2d_3);
-            Assert.IsFalse(span2d_3 == ReadOnlySpan2D<int>.Empty);
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_ImplicitCast()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            ReadOnlySpan2D<int> span2d_1 = array;
-            ReadOnlySpan2D<int> span2d_2 = new ReadOnlySpan2D<int>(array);
-
-            Assert.IsTrue(span2d_1 == span2d_2);
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_GetRow()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            int i = 0;
-            foreach (ref readonly int value in new ReadOnlySpan2D<int>(array).GetRow(1))
-            {
-                Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(value), ref array[1, i++]));
-            }
-
-            ReadOnlyRefEnumerable<int> enumerable = new ReadOnlySpan2D<int>(array).GetRow(1);
-
-            int[] expected = { 4, 5, 6 };
-
-            CollectionAssert.AreEqual(enumerable.ToArray(), expected);
-
-            Assert.AreSame(default(ReadOnlyRefEnumerable<int>).ToArray(), Array.Empty<int>());
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).GetRow(-1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).GetRow(2));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).GetRow(1000));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public unsafe void Test_ReadOnlySpan2DT_Pointer_GetRow()
-        {
-            int* array = stackalloc[]
-            {
-                1, 2, 3,
-                4, 5, 6
-            };
-
-            int i = 0;
-            foreach (ref readonly int value in new ReadOnlySpan2D<int>(array, 2, 3, 0).GetRow(1))
-            {
-                Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(value), ref array[3 + i++]));
-            }
-
-            ReadOnlyRefEnumerable<int> enumerable = new ReadOnlySpan2D<int>(array, 2, 3, 0).GetRow(1);
-
-            int[] expected = { 4, 5, 6 };
-
-            CollectionAssert.AreEqual(enumerable.ToArray(), expected);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 2, 3, 0).GetRow(-1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 2, 3, 0).GetRow(2));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 2, 3, 0).GetRow(1000));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_GetColumn()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            int i = 0;
-            foreach (ref readonly int value in new ReadOnlySpan2D<int>(array).GetColumn(1))
-            {
-                Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(value), ref array[i++, 1]));
-            }
-
-            ReadOnlyRefEnumerable<int> enumerable = new ReadOnlySpan2D<int>(array).GetColumn(2);
-
-            int[] expected = { 3, 6 };
-
-            CollectionAssert.AreEqual(enumerable.ToArray(), expected);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).GetColumn(-1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).GetColumn(3));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array).GetColumn(1000));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public unsafe void Test_ReadOnlySpan2DT_Pointer_GetColumn()
-        {
-            int* array = stackalloc[]
-            {
-                1, 2, 3,
-                4, 5, 6
-            };
-
-            int i = 0;
-            foreach (ref readonly int value in new ReadOnlySpan2D<int>(array, 2, 3, 0).GetColumn(1))
-            {
-                Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(value), ref array[(i++ * 3) + 1]));
-            }
-
-            ReadOnlyRefEnumerable<int> enumerable = new ReadOnlySpan2D<int>(array, 2, 3, 0).GetColumn(2);
-
-            int[] expected = { 3, 6 };
-
-            CollectionAssert.AreEqual(enumerable.ToArray(), expected);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 2, 3, 0).GetColumn(-1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 2, 3, 0).GetColumn(3));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new ReadOnlySpan2D<int>(array, 2, 3, 0).GetColumn(1000));
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_GetEnumerator()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            int[] result = new int[4];
-            int i = 0;
-
-            foreach (var item in new ReadOnlySpan2D<int>(array, 0, 1, 2, 2))
-            {
-                result[i++] = item;
-            }
-
-            int[] expected = { 2, 3, 5, 6 };
-
-            CollectionAssert.AreEqual(result, expected);
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public unsafe void Test_ReadOnlySpan2DT_Pointer_GetEnumerator()
-        {
-            int* array = stackalloc[]
-            {
-                1, 2, 3,
-                4, 5, 6
-            };
-
-            int[] result = new int[4];
-            int i = 0;
-
-            foreach (var item in new ReadOnlySpan2D<int>(array + 1, 2, 2, 1))
-            {
-                result[i++] = item;
-            }
-
-            int[] expected = { 2, 3, 5, 6 };
-
-            CollectionAssert.AreEqual(result, expected);
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_GetEnumerator_Empty()
-        {
-            var enumerator = ReadOnlySpan2D<int>.Empty.GetEnumerator();
-
-            Assert.IsFalse(enumerator.MoveNext());
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_ReadOnlyRefEnumerable_Misc()
-        {
-            int[,] array1 =
-            {
-                { 1, 2, 3, 4 },
-                { 5, 6, 7, 8 },
-                { 9, 10, 11, 12 },
-                { 13, 14, 15, 16 }
-            };
-
-            ReadOnlySpan2D<int> span1 = array1;
-
-            int[,] array2 = new int[4, 4];
-
-            // Copy to enumerable with source step == 1, destination step == 1
-            span1.GetRow(0).CopyTo(array2.GetRow(0));
-
-            // Copy enumerable with source step == 1, destination step != 1
-            span1.GetRow(1).CopyTo(array2.GetColumn(1));
-
-            // Copy enumerable with source step != 1, destination step == 1
-            span1.GetColumn(2).CopyTo(array2.GetRow(2));
-
-            // Copy enumerable with source step != 1, destination step != 1
-            span1.GetColumn(3).CopyTo(array2.GetColumn(3));
-
-            int[,] result =
-            {
-                { 1, 5, 3, 4 },
-                { 0, 6, 0, 8 },
-                { 3, 7, 11, 12 },
-                { 0, 8, 0, 16 }
-            };
-
-            CollectionAssert.AreEqual(array2, result);
-
-            // Test a valid and an invalid TryCopyTo call with the RefEnumerable<T> overload
-            bool shouldBeTrue = span1.GetRow(0).TryCopyTo(array2.GetColumn(0));
-            bool shouldBeFalse = span1.GetRow(0).TryCopyTo(default(RefEnumerable<int>));
-
-            result = new[,]
-            {
-                { 1, 5, 3, 4 },
-                { 2, 6, 0, 8 },
-                { 3, 7, 11, 12 },
-                { 4, 8, 0, 16 }
-            };
-
-            CollectionAssert.AreEqual(array2, result);
-
-            Assert.IsTrue(shouldBeTrue);
-            Assert.IsFalse(shouldBeFalse);
-        }
-
-        [TestCategory("ReadOnlySpan2DT")]
-        [TestMethod]
-        public void Test_ReadOnlySpan2DT_ReadOnlyRefEnumerable_Cast()
-        {
-            int[,] array1 =
-            {
-                { 1, 2, 3, 4 },
-                { 5, 6, 7, 8 },
-                { 9, 10, 11, 12 },
-                { 13, 14, 15, 16 }
-            };
-
-            int[] result = { 5, 6, 7, 8 };
-
-            // Cast a RefEnumerable<T> to a readonly one and verify the contents
-            int[] row = ((ReadOnlyRefEnumerable<int>)array1.GetRow(1)).ToArray();
-
-            CollectionAssert.AreEqual(result, row);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Span2D{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Span2D{T}.cs
deleted file mode 100644
index 15b98adb851..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Memory/Test_Span2D{T}.cs
+++ /dev/null
@@ -1,1176 +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.CodeAnalysis;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.Toolkit.HighPerformance.Enumerables;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_Span2DT
-    {
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_Empty()
-        {
-            // Like in the tests for Memory2D<T>, here we validate a number of empty spans
-            Span2D<int> empty1 = default;
-
-            Assert.IsTrue(empty1.IsEmpty);
-            Assert.AreEqual(empty1.Length, 0);
-            Assert.AreEqual(empty1.Width, 0);
-            Assert.AreEqual(empty1.Height, 0);
-
-            Span2D<string> empty2 = Span2D<string>.Empty;
-
-            Assert.IsTrue(empty2.IsEmpty);
-            Assert.AreEqual(empty2.Length, 0);
-            Assert.AreEqual(empty2.Width, 0);
-            Assert.AreEqual(empty2.Height, 0);
-
-            Span2D<int> empty3 = new int[4, 0];
-
-            Assert.IsTrue(empty3.IsEmpty);
-            Assert.AreEqual(empty3.Length, 0);
-            Assert.AreEqual(empty3.Width, 0);
-            Assert.AreEqual(empty3.Height, 4);
-
-            Span2D<int> empty4 = new int[0, 7];
-
-            Assert.IsTrue(empty4.IsEmpty);
-            Assert.AreEqual(empty4.Length, 0);
-            Assert.AreEqual(empty4.Width, 7);
-            Assert.AreEqual(empty4.Height, 0);
-        }
-
-#if !WINDOWS_UWP
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_Span2DT_RefConstructor()
-        {
-            Span<int> span = stackalloc[]
-            {
-                1, 2, 3, 4, 5, 6
-            };
-
-            // Test for a Span2D<T> instance created from a target reference. This is only supported
-            // on runtimes with fast Span<T> support (as we need the API to power this with just a ref).
-            Span2D<int> span2d = Span2D<int>.DangerousCreate(ref span[0], 2, 3, 0);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 6);
-            Assert.AreEqual(span2d.Width, 3);
-            Assert.AreEqual(span2d.Height, 2);
-
-            span2d[0, 0] = 99;
-            span2d[1, 2] = 101;
-
-            // Validate that those values were mapped to the right spot in the target span
-            Assert.AreEqual(span[0], 99);
-            Assert.AreEqual(span[5], 101);
-
-            // A few cases with invalid indices
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => Span2D<int>.DangerousCreate(ref Unsafe.AsRef<int>(null), -1, 0, 0));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => Span2D<int>.DangerousCreate(ref Unsafe.AsRef<int>(null), 1, -2, 0));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => Span2D<int>.DangerousCreate(ref Unsafe.AsRef<int>(null), 1, 0, -5));
-        }
-#endif
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_Span2DT_PtrConstructor()
-        {
-            int* ptr = stackalloc[]
-            {
-                1,
-                2,
-                3,
-                4,
-                5,
-                6
-            };
-
-            // Same as above, but creating a Span2D<T> from a raw pointer
-            Span2D<int> span2d = new Span2D<int>(ptr, 2, 3, 0);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 6);
-            Assert.AreEqual(span2d.Width, 3);
-            Assert.AreEqual(span2d.Height, 2);
-
-            span2d[0, 0] = 99;
-            span2d[1, 2] = 101;
-
-            Assert.AreEqual(ptr[0], 99);
-            Assert.AreEqual(ptr[5], 101);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>((void*)0, -1, 0, 0));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>((void*)0, 1, -2, 0));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>((void*)0, 1, 0, -5));
-            Assert.ThrowsException<ArgumentException>(() => new Span2D<string>((void*)0, 2, 2, 0));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_Array1DConstructor()
-        {
-            int[] array =
-            {
-                1, 2, 3, 4, 5, 6
-            };
-
-            // Same as above, but wrapping a 1D array with data in row-major order
-            Span2D<int> span2d = new Span2D<int>(array, 1, 2, 2, 1);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 4);
-            Assert.AreEqual(span2d.Width, 2);
-            Assert.AreEqual(span2d.Height, 2);
-
-            span2d[0, 0] = 99;
-            span2d[1, 1] = 101;
-
-            Assert.AreEqual(array[1], 99);
-            Assert.AreEqual(array[5], 101);
-
-            // The first check fails due to the array covariance test mentioned in the Memory2D<T> tests.
-            // The others just validate a number of cases with invalid arguments (eg. out of range).
-            Assert.ThrowsException<ArrayTypeMismatchException>(() => new Span2D<object>(new string[1], 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, -99, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 0, -10, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 0, 1, 1, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 0, 1, -100, 1));
-            Assert.ThrowsException<ArgumentException>(() => new Span2D<int>(array, 0, 10, 1, 120));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_Array2DConstructor_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Same as above, but directly wrapping a 2D array
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 6);
-            Assert.AreEqual(span2d.Width, 3);
-            Assert.AreEqual(span2d.Height, 2);
-
-            span2d[0, 1] = 99;
-            span2d[1, 2] = 101;
-
-            Assert.AreEqual(array[0, 1], 99);
-            Assert.AreEqual(array[1, 2], 101);
-
-            Assert.ThrowsException<ArrayTypeMismatchException>(() => new Span2D<object>(new string[1, 2]));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_Array2DConstructor_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Same as above, but with a custom slicing over the target 2D array
-            Span2D<int> span2d = new Span2D<int>(array, 0, 1, 2, 2);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 4);
-            Assert.AreEqual(span2d.Width, 2);
-            Assert.AreEqual(span2d.Height, 2);
-
-            span2d[0, 0] = 99;
-            span2d[1, 1] = 101;
-
-            Assert.AreEqual(array[0, 1], 99);
-            Assert.AreEqual(array[1, 2], 101);
-
-            Assert.ThrowsException<ArrayTypeMismatchException>(() => new Span2D<object>(new string[1, 2], 0, 0, 2, 2));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_Array3DConstructor_1()
-        {
-            int[,,] array =
-            {
-                {
-                    { 1, 2, 3 },
-                    { 4, 5, 6 }
-                },
-                {
-                    { 10, 20, 30 },
-                    { 40, 50, 60 }
-                }
-            };
-
-            // Here we wrap a layer in a 3D array instead, the rest is the same
-            Span2D<int> span2d = new Span2D<int>(array, 1);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 6);
-            Assert.AreEqual(span2d.Width, 3);
-            Assert.AreEqual(span2d.Height, 2);
-
-            span2d[0, 1] = 99;
-            span2d[1, 2] = 101;
-
-            Assert.AreEqual(span2d[0, 0], 10);
-            Assert.AreEqual(array[1, 0, 1], 99);
-            Assert.AreEqual(array[1, 1, 2], 101);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 20));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_Array3DConstructor_2()
-        {
-            int[,,] array =
-            {
-                {
-                    { 1, 2, 3 },
-                    { 4, 5, 6 }
-                },
-                {
-                    { 10, 20, 30 },
-                    { 40, 50, 60 }
-                }
-            };
-
-            // Same as above, but also slicing a target 2D area in the 3D array layer
-            Span2D<int> span2d = new Span2D<int>(array, 1, 0, 1, 2, 2);
-
-            Assert.IsFalse(span2d.IsEmpty);
-            Assert.AreEqual(span2d.Length, 4);
-            Assert.AreEqual(span2d.Width, 2);
-            Assert.AreEqual(span2d.Height, 2);
-
-            span2d[0, 1] = 99;
-            span2d[1, 1] = 101;
-
-            Assert.AreEqual(span2d[0, 0], 20);
-            Assert.AreEqual(array[1, 0, 2], 99);
-            Assert.AreEqual(array[1, 1, 2], 101);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, -1, 1, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 1, -1, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 1, 1, -1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 1, 1, 1, -1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 1, 1, 1, 1, -1));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_FillAndClear_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Tests for the Fill and Clear APIs for Span2D<T>. These should fill
-            // or clear the entire wrapped 2D array (just like eg. Span<T>.Fill).
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            span2d.Fill(42);
-
-            Assert.IsTrue(array.Cast<int>().All(n => n == 42));
-
-            span2d.Clear();
-
-            Assert.IsTrue(array.Cast<int>().All(n => n == 0));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_Fill_Empty()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Same as above, but with an initial slicing as well to ensure
-            // these method work correctly with different internal offsets
-            Span2D<int> span2d = new Span2D<int>(array, 0, 0, 0, 0);
-
-            span2d.Fill(42);
-
-            CollectionAssert.AreEqual(array, array);
-
-            span2d.Clear();
-
-            CollectionAssert.AreEqual(array, array);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_FillAndClear_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Same as above, just with different slicing to a target smaller 2D area
-            Span2D<int> span2d = new Span2D<int>(array, 0, 1, 2, 2);
-
-            span2d.Fill(42);
-
-            int[,] filled =
-            {
-                { 1, 42, 42 },
-                { 4, 42, 42 }
-            };
-
-            CollectionAssert.AreEqual(array, filled);
-
-            span2d.Clear();
-
-            int[,] cleared =
-            {
-                { 1, 0, 0 },
-                { 4, 0, 0 }
-            };
-
-            CollectionAssert.AreEqual(array, cleared);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_CopyTo_Empty()
-        {
-            Span2D<int> span2d = Span2D<int>.Empty;
-
-            int[] target = new int[0];
-
-            // Copying an emoty Span2D<T> to an empty array is just a no-op
-            span2d.CopyTo(target);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_CopyTo_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            int[] target = new int[array.Length];
-
-            // Here we copy a Span2D<T> to a target Span<T> mapping an array.
-            // This is valid, and the data will just be copied in row-major order.
-            span2d.CopyTo(target);
-
-            CollectionAssert.AreEqual(array, target);
-
-            // Exception due to the target span being too small for the source Span2D<T> instance
-            Assert.ThrowsException<ArgumentException>(() => new Span2D<int>(array).CopyTo(Span<int>.Empty));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_CopyTo_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Same as above, but with different initial slicing
-            Span2D<int> span2d = new Span2D<int>(array, 0, 1, 2, 2);
-
-            int[] target = new int[4];
-
-            span2d.CopyTo(target);
-
-            int[] expected = { 2, 3, 5, 6 };
-
-            CollectionAssert.AreEqual(target, expected);
-
-            Assert.ThrowsException<ArgumentException>(() => new Span2D<int>(array).CopyTo(Span<int>.Empty));
-            Assert.ThrowsException<ArgumentException>(() => new Span2D<int>(array, 0, 1, 2, 2).CopyTo(Span<int>.Empty));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_CopyTo2D_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            int[,] target = new int[2, 3];
-
-            // Same as above, but copying to a target Span2D<T> instead. Note
-            // that this method uses the implicit T[,] to Span2D<T> conversion.
-            span2d.CopyTo(target);
-
-            CollectionAssert.AreEqual(array, target);
-
-            Assert.ThrowsException<ArgumentException>(() => new Span2D<int>(array).CopyTo(Span2D<int>.Empty));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_CopyTo2D_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Same as above, but with extra initial slicing
-            Span2D<int> span2d = new Span2D<int>(array, 0, 1, 2, 2);
-
-            int[,] target = new int[2, 2];
-
-            span2d.CopyTo(target);
-
-            int[,] expected =
-            {
-                { 2, 3 },
-                { 5, 6 }
-            };
-
-            CollectionAssert.AreEqual(target, expected);
-
-            Assert.ThrowsException<ArgumentException>(() => new Span2D<int>(array).CopyTo(new Span2D<int>(target)));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_TryCopyTo()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            int[] target = new int[array.Length];
-
-            // Here we test the safe TryCopyTo method, which will fail gracefully
-            Assert.IsTrue(span2d.TryCopyTo(target));
-            Assert.IsFalse(span2d.TryCopyTo(Span<int>.Empty));
-
-            int[] expected = { 1, 2, 3, 4, 5, 6 };
-
-            CollectionAssert.AreEqual(target, expected);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_TryCopyTo2D()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Same as above, but copying to a 2D array with the safe TryCopyTo method
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            int[,] target = new int[2, 3];
-
-            Assert.IsTrue(span2d.TryCopyTo(target));
-            Assert.IsFalse(span2d.TryCopyTo(Span2D<int>.Empty));
-
-            int[,] expected =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            CollectionAssert.AreEqual(target, expected);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_Span2DT_GetPinnableReference()
-        {
-            // Here we test that a ref from an empty Span2D<T> returns a null ref
-            Assert.IsTrue(Unsafe.AreSame(
-                ref Unsafe.AsRef<int>(null),
-                ref Span2D<int>.Empty.GetPinnableReference()));
-
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            ref int r0 = ref span2d.GetPinnableReference();
-
-            // Here we test that GetPinnableReference returns a ref to the first array element
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref array[0, 0]));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_Span2DT_DangerousGetReference()
-        {
-            // Same as above, but using DangerousGetReference instead (faster, no conditional check)
-            Assert.IsTrue(Unsafe.AreSame(
-                ref Unsafe.AsRef<int>(null),
-                ref Span2D<int>.Empty.DangerousGetReference()));
-
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            ref int r0 = ref span2d.DangerousGetReference();
-
-            Assert.IsTrue(Unsafe.AreSame(ref r0, ref array[0, 0]));
-        }
-
-#if NETCOREAPP3_1_OR_GREATER
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_Span2DT_Index_Indexer_1()
-        {
-            int[,] array = new int[4, 4];
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            ref int arrayRef = ref array[1, 3];
-            ref int span2dRef = ref span2d[1, ^1];
-
-            Assert.IsTrue(Unsafe.AreSame(ref arrayRef, ref span2dRef));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_Span2DT_Index_Indexer_2()
-        {
-            int[,] array = new int[4, 4];
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            ref int arrayRef = ref array[2, 1];
-            ref int span2dRef = ref span2d[^2, ^3];
-
-            Assert.IsTrue(Unsafe.AreSame(ref arrayRef, ref span2dRef));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        [ExpectedException(typeof(IndexOutOfRangeException))]
-        public unsafe void Test_Span2DT_Index_Indexer_Fail()
-        {
-            int[,] array = new int[4, 4];
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            ref int span2dRef = ref span2d[^6, 2];
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_Span2DT_Range_Indexer_1()
-        {
-            int[,] array = new int[4, 4];
-
-            Span2D<int> span2d = new Span2D<int>(array);
-            Span2D<int> slice = span2d[1.., 1..];
-
-            Assert.AreEqual(slice.Length, 9);
-            Assert.IsTrue(Unsafe.AreSame(ref array[1, 1], ref slice[0, 0]));
-            Assert.IsTrue(Unsafe.AreSame(ref array[3, 3], ref slice[2, 2]));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_Span2DT_Range_Indexer_2()
-        {
-            int[,] array = new int[4, 4];
-
-            Span2D<int> span2d = new Span2D<int>(array);
-            Span2D<int> slice = span2d[0..^2, 1..^1];
-
-            Assert.AreEqual(slice.Length, 4);
-            Assert.IsTrue(Unsafe.AreSame(ref array[0, 1], ref slice[0, 0]));
-            Assert.IsTrue(Unsafe.AreSame(ref array[1, 2], ref slice[1, 1]));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public unsafe void Test_Span2DT_Range_Indexer_Fail()
-        {
-            int[,] array = new int[4, 4];
-
-            Span2D<int> span2d = new Span2D<int>(array);
-            _ = span2d[0..6, 2..^1];
-
-            Assert.Fail();
-        }
-#endif
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_Slice_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Here we have a number of tests that just take an initial 2D array, create a Span2D<T>,
-            // perform a number of slicing operations and then validate the parameters for the resulting
-            // instances, and that the indexer works correctly and maps to the right original elements.
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            Span2D<int> slice1 = span2d.Slice(1, 1, 1, 2);
-
-            Assert.AreEqual(slice1.Length, 2);
-            Assert.AreEqual(slice1.Height, 1);
-            Assert.AreEqual(slice1.Width, 2);
-            Assert.AreEqual(slice1[0, 0], 5);
-            Assert.AreEqual(slice1[0, 1], 6);
-
-            Span2D<int> slice2 = span2d.Slice(0, 1, 2, 2);
-
-            Assert.AreEqual(slice2.Length, 4);
-            Assert.AreEqual(slice2.Height, 2);
-            Assert.AreEqual(slice2.Width, 2);
-            Assert.AreEqual(slice2[0, 0], 2);
-            Assert.AreEqual(slice2[1, 0], 5);
-            Assert.AreEqual(slice2[1, 1], 6);
-
-            // Some checks for invalid arguments
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).Slice(-1, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).Slice(1, -1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).Slice(1, 1, 1, -1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).Slice(1, 1, -1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).Slice(10, 1, 1, 1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).Slice(1, 12, 1, 12));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).Slice(1, 1, 55, 1));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_Slice_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            // Same as above, but with some different slicing
-            Span2D<int> slice1 = span2d.Slice(0, 0, 2, 2);
-
-            Assert.AreEqual(slice1.Length, 4);
-            Assert.AreEqual(slice1.Height, 2);
-            Assert.AreEqual(slice1.Width, 2);
-            Assert.AreEqual(slice1[0, 0], 1);
-            Assert.AreEqual(slice1[1, 1], 5);
-
-            Span2D<int> slice2 = slice1.Slice(1, 0, 1, 2);
-
-            Assert.AreEqual(slice2.Length, 2);
-            Assert.AreEqual(slice2.Height, 1);
-            Assert.AreEqual(slice2.Width, 2);
-            Assert.AreEqual(slice2[0, 0], 4);
-            Assert.AreEqual(slice2[0, 1], 5);
-
-            Span2D<int> slice3 = slice2.Slice(0, 1, 1, 1);
-
-            Assert.AreEqual(slice3.Length, 1);
-            Assert.AreEqual(slice3.Height, 1);
-            Assert.AreEqual(slice3.Width, 1);
-            Assert.AreEqual(slice3[0, 0], 5);
-        }
-
-#if !WINDOWS_UWP
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_GetRowSpan()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            // Here we create a Span2D<T> from a 2D array and want to get a Span<T> from
-            // a specific row. This is only supported on runtimes with fast Span<T> support
-            // for the same reason mentioned in the Memory2D<T> tests (we need the Span<T>
-            // constructor that only takes a target ref). Then we just get some references
-            // to items in this span and compare them against references into the original
-            // 2D array to ensure they match and point to the correct elements from there.
-            Span<int> span = span2d.GetRowSpan(1);
-
-            Assert.IsTrue(Unsafe.AreSame(
-                ref span[0],
-                ref array[1, 0]));
-            Assert.IsTrue(Unsafe.AreSame(
-                ref span[2],
-                ref array[1, 2]));
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).GetRowSpan(-1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).GetRowSpan(5));
-        }
-#endif
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_TryGetSpan_From1DArray_1()
-        {
-            int[] array = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-            Span2D<int> span2d = new Span2D<int>(array, 3, 3);
-
-            bool success = span2d.TryGetSpan(out Span<int> span);
-
-            Assert.IsTrue(success);
-            Assert.AreEqual(span.Length, span2d.Length);
-            Assert.IsTrue(Unsafe.AreSame(ref array[0], ref span[0]));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_TryGetSpan_From1DArray_2()
-        {
-            int[] array = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-            Span2D<int> span2d = new Span2D<int>(array, 3, 3).Slice(1, 0, 2, 3);
-
-            bool success = span2d.TryGetSpan(out Span<int> span);
-
-            Assert.IsTrue(success);
-            Assert.AreEqual(span.Length, span2d.Length);
-            Assert.IsTrue(Unsafe.AreSame(ref array[3], ref span[0]));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_TryGetSpan_From1DArray_3()
-        {
-            int[] array = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-            Span2D<int> span2d = new Span2D<int>(array, 3, 3).Slice(0, 1, 3, 2);
-
-            bool success = span2d.TryGetSpan(out Span<int> span);
-
-            Assert.IsFalse(success);
-            Assert.AreEqual(span.Length, 0);
-        }
-
-        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/3947
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_TryGetSpan_From1DArray_4()
-        {
-            int[] array = new int[128];
-            Span2D<int> span2d = new Span2D<int>(array, 8, 16);
-
-            bool success = span2d.TryGetSpan(out Span<int> span);
-
-            Assert.IsTrue(success);
-            Assert.AreEqual(span.Length, span2d.Length);
-            Assert.IsTrue(Unsafe.AreSame(ref array[0], ref span[0]));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_TryGetSpan_From2DArray_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            // This API tries to get a Span<T> for the entire contents of Span2D<T>.
-            // This only works on runtimes if the underlying data is contiguous
-            // and of a size that can fit into a single Span<T>. In this specific test,
-            // this is not expected to work on UWP because it can't create a Span<T>
-            // from a 2D array (reasons explained in the comments for the test above).
-            bool success = span2d.TryGetSpan(out Span<int> span);
-
-#if WINDOWS_UWP
-            // Can't get a Span<T> over a T[,] array on UWP
-            Assert.IsFalse(success);
-            Assert.AreEqual(span.Length, 0);
-#else
-            Assert.IsTrue(success);
-            Assert.AreEqual(span.Length, span2d.Length);
-#endif
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_TryGetSpan_From2DArray_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Same as above, but this will always fail because we're creating
-            // a Span2D<T> wrapping non contiguous data (the pitch is not 0).
-            Span2D<int> span2d = new Span2D<int>(array, 0, 0, 2, 2);
-
-            bool success = span2d.TryGetSpan(out Span<int> span);
-
-            Assert.IsFalse(success);
-            Assert.IsTrue(span.IsEmpty);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_ToArray_1()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Here we create a Span2D<T> and verify that ToArray() produces
-            // a 2D array that is identical to the original one being wrapped.
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            int[,] copy = span2d.ToArray();
-
-            Assert.AreEqual(copy.GetLength(0), array.GetLength(0));
-            Assert.AreEqual(copy.GetLength(1), array.GetLength(1));
-
-            CollectionAssert.AreEqual(array, copy);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_ToArray_2()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Same as above, but with extra initial slicing
-            Span2D<int> span2d = new Span2D<int>(array, 0, 0, 2, 2);
-
-            int[,] copy = span2d.ToArray();
-
-            Assert.AreEqual(copy.GetLength(0), 2);
-            Assert.AreEqual(copy.GetLength(1), 2);
-
-            int[,] expected =
-            {
-                { 1, 2 },
-                { 4, 5 }
-            };
-
-            CollectionAssert.AreEqual(expected, copy);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        [ExpectedException(typeof(NotSupportedException))]
-        public void Test_Span2DT_Equals()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            // Span2D<T>.Equals always throw (this mirrors the behavior of Span<T>.Equals)
-            _ = span2d.Equals(null);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        [ExpectedException(typeof(NotSupportedException))]
-        public void Test_Span2DT_GetHashCode()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            // Same as above, this always throws
-            _ = span2d.GetHashCode();
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_ToString()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            Span2D<int> span2d = new Span2D<int>(array);
-
-            // Verify that we get the nicely formatted string
-            string text = span2d.ToString();
-
-            const string expected = "Microsoft.Toolkit.HighPerformance.Span2D<System.Int32>[2, 3]";
-
-            Assert.AreEqual(text, expected);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_opEquals()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Create two Span2D<T> instances wrapping the same array with the same
-            // parameters, and verify that the equality operators work correctly.
-            Span2D<int> span2d_1 = new Span2D<int>(array);
-            Span2D<int> span2d_2 = new Span2D<int>(array);
-
-            Assert.IsTrue(span2d_1 == span2d_2);
-            Assert.IsFalse(span2d_1 == Span2D<int>.Empty);
-            Assert.IsTrue(Span2D<int>.Empty == Span2D<int>.Empty);
-
-            // Same as above, but verify that a sliced span is not reported as equal
-            Span2D<int> span2d_3 = new Span2D<int>(array, 0, 0, 2, 2);
-
-            Assert.IsFalse(span2d_1 == span2d_3);
-            Assert.IsFalse(span2d_3 == Span2D<int>.Empty);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_ImplicitCast()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Verify that an explicit constructor and the implicit conversion
-            // operator generate an identical Span2D<T> instance from the array.
-            Span2D<int> span2d_1 = array;
-            Span2D<int> span2d_2 = new Span2D<int>(array);
-
-            Assert.IsTrue(span2d_1 == span2d_2);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_GetRow()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Get a target row and verify the contents match with our data
-            RefEnumerable<int> enumerable = new Span2D<int>(array).GetRow(1);
-
-            int[] expected = { 4, 5, 6 };
-
-            CollectionAssert.AreEqual(enumerable.ToArray(), expected);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).GetRow(-1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).GetRow(2));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).GetRow(1000));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_Span2DT_Pointer_GetRow()
-        {
-            int* array = stackalloc[]
-            {
-                1, 2, 3,
-                4, 5, 6
-            };
-
-            // Same as above, but with a Span2D<T> wrapping a raw pointer
-            RefEnumerable<int> enumerable = new Span2D<int>(array, 2, 3, 0).GetRow(1);
-
-            int[] expected = { 4, 5, 6 };
-
-            CollectionAssert.AreEqual(enumerable.ToArray(), expected);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 2, 3, 0).GetRow(-1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 2, 3, 0).GetRow(2));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 2, 3, 0).GetRow(1000));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_GetColumn()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            // Same as above, but getting a column instead
-            RefEnumerable<int> enumerable = new Span2D<int>(array).GetColumn(2);
-
-            int[] expected = { 3, 6 };
-
-            CollectionAssert.AreEqual(enumerable.ToArray(), expected);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).GetColumn(-1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).GetColumn(3));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array).GetColumn(1000));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_Span2DT_Pointer_GetColumn()
-        {
-            int* array = stackalloc[]
-            {
-                1, 2, 3,
-                4, 5, 6
-            };
-
-            // Same as above, but wrapping a raw pointer
-            RefEnumerable<int> enumerable = new Span2D<int>(array, 2, 3, 0).GetColumn(2);
-
-            int[] expected = { 3, 6 };
-
-            CollectionAssert.AreEqual(enumerable.ToArray(), expected);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 2, 3, 0).GetColumn(-1));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 2, 3, 0).GetColumn(3));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => new Span2D<int>(array, 2, 3, 0).GetColumn(1000));
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_GetEnumerator()
-        {
-            int[,] array =
-            {
-                { 1, 2, 3 },
-                { 4, 5, 6 }
-            };
-
-            int[] result = new int[4];
-            int i = 0;
-
-            // Here we want to test the Span2D<T> enumerator. We create a Span2D<T> instance over
-            // a given section of the initial 2D array, then iterate over it and store the items
-            // into a temporary array. We then just compare the contents to ensure they match.
-            foreach (ref var item in new Span2D<int>(array, 0, 1, 2, 2))
-            {
-                // Check the reference to ensure it points to the right original item
-                Assert.IsTrue(Unsafe.AreSame(
-                    ref array[i / 2, (i % 2) + 1],
-                    ref item));
-
-                // Also store the value to compare it later (redundant, but just in case)
-                result[i++] = item;
-            }
-
-            int[] expected = { 2, 3, 5, 6 };
-
-            CollectionAssert.AreEqual(result, expected);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public unsafe void Test_Span2DT_Pointer_GetEnumerator()
-        {
-            int* array = stackalloc[]
-            {
-                1, 2, 3,
-                4, 5, 6
-            };
-
-            int[] result = new int[4];
-            int i = 0;
-
-            // Same test as above, but wrapping a raw pointer
-            foreach (ref var item in new Span2D<int>(array + 1, 2, 2, 1))
-            {
-                // Check the reference again
-                Assert.IsTrue(Unsafe.AreSame(
-                    ref Unsafe.AsRef<int>(&array[((i / 2) * 3) + (i % 2) + 1]),
-                    ref item));
-
-                result[i++] = item;
-            }
-
-            int[] expected = { 2, 3, 5, 6 };
-
-            CollectionAssert.AreEqual(result, expected);
-        }
-
-        [TestCategory("Span2DT")]
-        [TestMethod]
-        public void Test_Span2DT_GetEnumerator_Empty()
-        {
-            var enumerator = Span2D<int>.Empty.GetEnumerator();
-
-            // Ensure that an enumerator from an empty Span2D<T> can't move next
-            Assert.IsFalse(enumerator.MoveNext());
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IBufferWriterStream.cs b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IBufferWriterStream.cs
deleted file mode 100644
index 6762fec4973..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IBufferWriterStream.cs
+++ /dev/null
@@ -1,161 +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.Buffers;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.Toolkit.HighPerformance.Buffers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Streams
-{
-    [TestClass]
-    public class Test_IBufferWriterStream
-    {
-        [TestCategory("IBufferWriterStream")]
-        [TestMethod]
-        public void Test_IBufferWriterStream_Lifecycle()
-        {
-            ArrayPoolBufferWriter<byte> writer = new ArrayPoolBufferWriter<byte>();
-
-            // Get a stream from a buffer writer aand validate that it can only be written to.
-            // This is to mirror the same functionality as the IBufferWriter<T> interface.
-            Stream stream = ((IBufferWriter<byte>)writer).AsStream();
-
-            Assert.IsFalse(stream.CanRead);
-            Assert.IsFalse(stream.CanSeek);
-            Assert.IsTrue(stream.CanWrite);
-
-            Assert.ThrowsException<NotSupportedException>(() => stream.Length);
-            Assert.ThrowsException<NotSupportedException>(() => stream.Position);
-
-            // Dispose the stream and check that no operation is now allowed
-            stream.Dispose();
-
-            Assert.IsFalse(stream.CanRead);
-            Assert.IsFalse(stream.CanSeek);
-            Assert.IsFalse(stream.CanWrite);
-            Assert.ThrowsException<NotSupportedException>(() => stream.Length);
-            Assert.ThrowsException<NotSupportedException>(() => stream.Position);
-        }
-
-        [TestCategory("IBufferWriterStream")]
-        [TestMethod]
-        public void Test_IBufferWriterStream_Write_Array()
-        {
-            ArrayPoolBufferWriter<byte> writer = new ArrayPoolBufferWriter<byte>();
-            Stream stream = ((IBufferWriter<byte>)writer).AsStream();
-
-            byte[] data = Test_MemoryStream.CreateRandomData(64);
-
-            // Write random data to the stream wrapping the buffer writer, and validate
-            // that the state of the writer is consistent, and the written content matches.
-            stream.Write(data, 0, data.Length);
-
-            Assert.AreEqual(writer.WrittenCount, data.Length);
-            Assert.IsTrue(writer.WrittenSpan.SequenceEqual(data));
-
-            // A few tests with invalid inputs (null buffers, invalid indices, etc.)
-            Assert.ThrowsException<ArgumentNullException>(() => stream.Write(null, 0, 10));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => stream.Write(data, -1, 10));
-            Assert.ThrowsException<ArgumentException>(() => stream.Write(data, 200, 10));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => stream.Write(data, 0, -24));
-            Assert.ThrowsException<ArgumentException>(() => stream.Write(data, 0, 200));
-
-            stream.Dispose();
-
-            Assert.ThrowsException<ObjectDisposedException>(() => stream.Write(data, 0, data.Length));
-        }
-
-        [TestCategory("IBufferWriterStream")]
-        [TestMethod]
-        public async Task Test_IBufferWriterStream_WriteAsync_Array()
-        {
-            ArrayPoolBufferWriter<byte> writer = new ArrayPoolBufferWriter<byte>();
-            Stream stream = ((IBufferWriter<byte>)writer).AsStream();
-
-            byte[] data = Test_MemoryStream.CreateRandomData(64);
-
-            // Same test as above, but using an asynchronous write instead
-            await stream.WriteAsync(data, 0, data.Length);
-
-            Assert.AreEqual(writer.WrittenCount, data.Length);
-            Assert.IsTrue(writer.WrittenSpan.SequenceEqual(data));
-
-            await Assert.ThrowsExceptionAsync<ArgumentNullException>(() => stream.WriteAsync(null, 0, 10));
-            await Assert.ThrowsExceptionAsync<ArgumentOutOfRangeException>(() => stream.WriteAsync(data, -1, 10));
-            await Assert.ThrowsExceptionAsync<ArgumentException>(() => stream.WriteAsync(data, 200, 10));
-            await Assert.ThrowsExceptionAsync<ArgumentOutOfRangeException>(() => stream.WriteAsync(data, 0, -24));
-            await Assert.ThrowsExceptionAsync<ArgumentException>(() => stream.WriteAsync(data, 0, 200));
-
-            stream.Dispose();
-
-            await Assert.ThrowsExceptionAsync<ObjectDisposedException>(() => stream.WriteAsync(data, 0, data.Length));
-        }
-
-        [TestCategory("IBufferWriterStream")]
-        [TestMethod]
-        [SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1500", Justification = "Array initialization")]
-        public void Test_IBufferWriterStream_WriteByte()
-        {
-            ArrayPoolBufferWriter<byte> writer = new ArrayPoolBufferWriter<byte>();
-            Stream stream = ((IBufferWriter<byte>)writer).AsStream();
-
-            ReadOnlySpan<byte> data = stackalloc byte[] { 1, 128, 255, 32 };
-
-            foreach (var item in data.Enumerate())
-            {
-                // Since we're enumerating, we can also double check the current written count
-                // at each iteration, to ensure the writes are done correctly every time.
-                Assert.AreEqual(writer.WrittenCount, item.Index);
-
-                // Write a number of bytes one by one to test this API as well
-                stream.WriteByte(item.Value);
-            }
-
-            // Validate the final written length and actual data
-            Assert.AreEqual(writer.WrittenCount, data.Length);
-            Assert.IsTrue(data.SequenceEqual(writer.WrittenSpan));
-
-            Assert.ThrowsException<NotSupportedException>(() => stream.ReadByte());
-        }
-
-        [TestCategory("IBufferWriterStream")]
-        [TestMethod]
-        public void Test_IBufferWriterStream_Write_Span()
-        {
-            ArrayPoolBufferWriter<byte> writer = new ArrayPoolBufferWriter<byte>();
-            Stream stream = ((IBufferWriter<byte>)writer).AsStream();
-
-            Memory<byte> data = Test_MemoryStream.CreateRandomData(64);
-
-            // This will use the extension when on .NET Standard 2.0,
-            // as the Stream class doesn't have Spam<T> or Memory<T>
-            // public APIs there. This is the case eg. on UWP as well.
-            stream.Write(data.Span);
-
-            Assert.AreEqual(writer.WrittenCount, data.Length);
-            Assert.IsTrue(data.Span.SequenceEqual(writer.WrittenSpan));
-        }
-
-        [TestCategory("IBufferWriterStream")]
-        [TestMethod]
-        public async Task Test_IBufferWriterStream_WriteAsync_Memory()
-        {
-            ArrayPoolBufferWriter<byte> writer = new ArrayPoolBufferWriter<byte>();
-            Stream stream = ((IBufferWriter<byte>)writer).AsStream();
-
-            Memory<byte> data = Test_MemoryStream.CreateRandomData(64);
-
-            // Same as the other asynchronous test above, but writing from a Memory<T>
-            await stream.WriteAsync(data);
-
-            Assert.AreEqual(writer.WrittenCount, data.Length);
-            Assert.IsTrue(data.Span.SequenceEqual(writer.WrittenSpan));
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IMemoryOwnerStream.cs b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IMemoryOwnerStream.cs
deleted file mode 100644
index 6ff4765992d..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_IMemoryOwnerStream.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;
-using System.IO;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.Toolkit.HighPerformance.Buffers;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Streams
-{
-    [TestClass]
-    public class Test_IMemoryOwnerStream
-    {
-        [TestCategory("IMemoryOwnerStream")]
-        [TestMethod]
-        public void Test_IMemoryOwnerStream_Lifecycle()
-        {
-            MemoryOwner<byte> buffer = MemoryOwner<byte>.Allocate(100);
-
-            Stream stream = buffer.AsStream();
-
-            Assert.IsTrue(stream.CanRead);
-            Assert.IsTrue(stream.CanSeek);
-            Assert.IsTrue(stream.CanWrite);
-            Assert.AreEqual(stream.Length, buffer.Length);
-            Assert.AreEqual(stream.Position, 0);
-
-            stream.Dispose();
-
-            Assert.ThrowsException<ObjectDisposedException>(() => buffer.Memory);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.ThrowExceptions.cs b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.ThrowExceptions.cs
deleted file mode 100644
index 333c5c7c7ff..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.ThrowExceptions.cs
+++ /dev/null
@@ -1,182 +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.IO;
-using System.Linq;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Streams
-{
-    public partial class Test_MemoryStream
-    {
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        public void Test_MemoryStream_ParameterName_ThrowArgumentExceptionForPosition()
-        {
-            var stream = new byte[10].AsMemory().AsStream();
-
-            try
-            {
-                stream.Position = -1;
-            }
-            catch (ArgumentOutOfRangeException e) when (e.GetType() == typeof(ArgumentOutOfRangeException))
-            {
-                Assert.AreEqual(e.ParamName, nameof(Stream.Position));
-
-                return;
-            }
-
-            Assert.Fail("Failed to raise correct exception");
-        }
-
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        public void Test_MemoryStream_ParameterName_ThrowArgumentExceptionForSeekOrigin()
-        {
-            var stream = new byte[10].AsMemory().AsStream();
-
-            try
-            {
-                stream.Seek(0, (SeekOrigin)int.MinValue);
-            }
-            catch (ArgumentException e) when (e.GetType() == typeof(ArgumentException))
-            {
-                var method = stream.GetType().GetMethod(nameof(Stream.Seek));
-                var name = method!.GetParameters()[1].Name;
-
-                Assert.AreEqual(e.ParamName, name);
-
-                return;
-            }
-
-            Assert.Fail("Failed to raise correct exception");
-        }
-
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        public void Test_MemoryStream_ParameterName_ThrowArgumentNullExceptionForNullBuffer()
-        {
-            var stream = new byte[10].AsMemory().AsStream();
-
-            try
-            {
-                stream.Write(null, 0, 10);
-            }
-            catch (ArgumentNullException e) when (e.GetType() == typeof(ArgumentNullException))
-            {
-                var name = (
-                    from method in typeof(Stream).GetMethods()
-                    where method.Name == nameof(Stream.Write)
-                    let normalParams = method.GetParameters()
-                    where
-                        normalParams.Length == 3 &&
-                        normalParams[0].ParameterType == typeof(byte[]) &&
-                        normalParams[1].ParameterType == typeof(int) &&
-                        normalParams[2].ParameterType == typeof(int)
-                    select normalParams[0].Name).Single();
-
-                Assert.AreEqual(e.ParamName, name);
-
-                return;
-            }
-
-            Assert.Fail("Failed to raise correct exception");
-        }
-
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        public void Test_MemoryStream_ParameterName_ThrowArgumentOutOfRangeExceptionForNegativeOffset()
-        {
-            var stream = new byte[10].AsMemory().AsStream();
-
-            try
-            {
-                stream.Write(new byte[1], -1, 10);
-            }
-            catch (ArgumentOutOfRangeException e) when (e.GetType() == typeof(ArgumentOutOfRangeException))
-            {
-                var name = (
-                    from method in typeof(Stream).GetMethods()
-                    where method.Name == nameof(Stream.Write)
-                    let normalParams = method.GetParameters()
-                    where
-                        normalParams.Length == 3 &&
-                        normalParams[0].ParameterType == typeof(byte[]) &&
-                        normalParams[1].ParameterType == typeof(int) &&
-                        normalParams[2].ParameterType == typeof(int)
-                    select normalParams[1].Name).Single();
-
-                Assert.AreEqual(e.ParamName, name);
-
-                return;
-            }
-
-            Assert.Fail("Failed to raise correct exception");
-        }
-
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        public void Test_MemoryStream_ParameterName_ThrowArgumentOutOfRangeExceptionForNegativeCount()
-        {
-            var stream = new byte[10].AsMemory().AsStream();
-
-            try
-            {
-                stream.Write(new byte[1], 0, -1);
-            }
-            catch (ArgumentOutOfRangeException e) when (e.GetType() == typeof(ArgumentOutOfRangeException))
-            {
-                var name = (
-                    from method in typeof(Stream).GetMethods()
-                    where method.Name == nameof(Stream.Write)
-                    let normalParams = method.GetParameters()
-                    where
-                        normalParams.Length == 3 &&
-                        normalParams[0].ParameterType == typeof(byte[]) &&
-                        normalParams[1].ParameterType == typeof(int) &&
-                        normalParams[2].ParameterType == typeof(int)
-                    select normalParams[2].Name).Single();
-
-                Assert.AreEqual(e.ParamName, name);
-
-                return;
-            }
-
-            Assert.Fail("Failed to raise correct exception");
-        }
-
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        public void Test_MemoryStream_ParameterName_ThrowArgumentExceptionForExceededBufferSize()
-        {
-            var stream = new byte[10].AsMemory().AsStream();
-
-            try
-            {
-                stream.Write(new byte[1], 0, 10);
-            }
-            catch (ArgumentException e) when (e.GetType() == typeof(ArgumentException))
-            {
-                var name = (
-                    from method in typeof(Stream).GetMethods()
-                    where method.Name == nameof(Stream.Write)
-                    let normalParams = method.GetParameters()
-                    where
-                        normalParams.Length == 3 &&
-                        normalParams[0].ParameterType == typeof(byte[]) &&
-                        normalParams[1].ParameterType == typeof(int) &&
-                        normalParams[2].ParameterType == typeof(int)
-                    select normalParams[0].Name).Single();
-
-                Assert.AreEqual(e.ParamName, name);
-
-                return;
-            }
-
-            Assert.Fail("Failed to raise correct exception");
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.cs b/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.cs
deleted file mode 100644
index 71047797cc7..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Streams/Test_MemoryStream.cs
+++ /dev/null
@@ -1,289 +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.CodeAnalysis;
-using System.Diagnostics.Contracts;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance.Streams
-{
-    [TestClass]
-    public partial class Test_MemoryStream
-    {
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        public void Test_MemoryStream_Lifecycle()
-        {
-            Memory<byte> memory = new byte[100];
-
-            Stream stream = memory.AsStream();
-
-            Assert.IsTrue(stream.CanRead);
-            Assert.IsTrue(stream.CanSeek);
-            Assert.IsTrue(stream.CanWrite);
-            Assert.AreEqual(stream.Length, memory.Length);
-            Assert.AreEqual(stream.Position, 0);
-
-            stream.Dispose();
-
-            Assert.IsFalse(stream.CanRead);
-            Assert.IsFalse(stream.CanSeek);
-            Assert.IsFalse(stream.CanWrite);
-            Assert.ThrowsException<ObjectDisposedException>(() => stream.Length);
-            Assert.ThrowsException<ObjectDisposedException>(() => stream.Position);
-        }
-
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        public void Test_MemoryStream_Seek()
-        {
-            Stream stream = new byte[100].AsMemory().AsStream();
-
-            Assert.AreEqual(stream.Position, 0);
-
-            stream.Position = 42;
-
-            Assert.AreEqual(stream.Position, 42);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => stream.Position = -1);
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => stream.Position = 120);
-
-            stream.Seek(0, SeekOrigin.Begin);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => stream.Seek(-1, SeekOrigin.Begin));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => stream.Seek(120, SeekOrigin.Begin));
-
-            Assert.AreEqual(stream.Position, 0);
-
-            stream.Seek(-1, SeekOrigin.End);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => stream.Seek(20, SeekOrigin.End));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => stream.Seek(-120, SeekOrigin.End));
-
-            Assert.AreEqual(stream.Position, stream.Length - 1);
-
-            stream.Seek(42, SeekOrigin.Begin);
-            stream.Seek(20, SeekOrigin.Current);
-            stream.Seek(-30, SeekOrigin.Current);
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => stream.Seek(-64, SeekOrigin.Current));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => stream.Seek(80, SeekOrigin.Current));
-
-            Assert.AreEqual(stream.Position, 32);
-        }
-
-        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/3536
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        public void Test_MemoryStream_WriteToEndAndRefreshPosition()
-        {
-            byte[]
-                array = new byte[10],
-                temp = new byte[1];
-            ReadOnlyMemory<byte> memory = array;
-
-            using var stream = memory.AsStream();
-
-            for (int i = 0; i < array.Length; i++)
-            {
-                int read = stream.Read(temp, 0, 1);
-
-                Assert.AreEqual(read, 1);
-                Assert.AreEqual(stream.Position, i + 1);
-            }
-
-            Assert.AreEqual(stream.Position, array.Length);
-
-            // These should not throw, seeking to the end is valid
-            stream.Position = stream.Position;
-            Assert.AreEqual(stream.Position, array.Length);
-
-            stream.Seek(array.Length, SeekOrigin.Begin);
-            Assert.AreEqual(stream.Position, array.Length);
-
-            stream.Seek(0, SeekOrigin.Current);
-            Assert.AreEqual(stream.Position, array.Length);
-
-            stream.Seek(0, SeekOrigin.End);
-            Assert.AreEqual(stream.Position, array.Length);
-        }
-
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        public void Test_MemoryStream_ReadWrite_Array()
-        {
-            Stream stream = new byte[100].AsMemory().AsStream();
-
-            byte[] data = CreateRandomData(64);
-
-            stream.Write(data, 0, data.Length);
-
-            Assert.AreEqual(stream.Position, data.Length);
-
-            stream.Position = 0;
-
-            byte[] result = new byte[data.Length];
-
-            int bytesRead = stream.Read(result, 0, result.Length);
-
-            Assert.AreEqual(bytesRead, result.Length);
-            Assert.AreEqual(stream.Position, data.Length);
-            Assert.IsTrue(data.AsSpan().SequenceEqual(result));
-
-            Assert.ThrowsException<ArgumentNullException>(() => stream.Write(null, 0, 10));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => stream.Write(data, -1, 10));
-            Assert.ThrowsException<ArgumentException>(() => stream.Write(data, 200, 10));
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() => stream.Write(data, 0, -24));
-            Assert.ThrowsException<ArgumentException>(() => stream.Write(data, 0, 200));
-
-            stream.Dispose();
-
-            Assert.ThrowsException<ObjectDisposedException>(() => stream.Write(data, 0, data.Length));
-        }
-
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        public async Task Test_MemoryStream_ReadWriteAsync_Array()
-        {
-            Stream stream = new byte[100].AsMemory().AsStream();
-
-            byte[] data = CreateRandomData(64);
-
-            await stream.WriteAsync(data, 0, data.Length);
-
-            Assert.AreEqual(stream.Position, data.Length);
-
-            stream.Position = 0;
-
-            byte[] result = new byte[data.Length];
-
-            int bytesRead = await stream.ReadAsync(result, 0, result.Length);
-
-            Assert.AreEqual(bytesRead, result.Length);
-            Assert.AreEqual(stream.Position, data.Length);
-            Assert.IsTrue(data.AsSpan().SequenceEqual(result));
-
-            await Assert.ThrowsExceptionAsync<ArgumentNullException>(() => stream.WriteAsync(null, 0, 10));
-            await Assert.ThrowsExceptionAsync<ArgumentOutOfRangeException>(() => stream.WriteAsync(data, -1, 10));
-            await Assert.ThrowsExceptionAsync<ArgumentException>(() => stream.WriteAsync(data, 200, 10));
-            await Assert.ThrowsExceptionAsync<ArgumentOutOfRangeException>(() => stream.WriteAsync(data, 0, -24));
-            await Assert.ThrowsExceptionAsync<ArgumentException>(() => stream.WriteAsync(data, 0, 200));
-
-            stream.Dispose();
-
-            await Assert.ThrowsExceptionAsync<ObjectDisposedException>(() => stream.WriteAsync(data, 0, data.Length));
-        }
-
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        [SuppressMessage("StyleCop.CSharp.LayoutRules", "SA1500", Justification = "Array initialization")]
-        public void Test_MemoryStream_ReadWriteByte()
-        {
-            Stream stream = new byte[4].AsMemory().AsStream();
-
-            ReadOnlySpan<byte> data = stackalloc byte[] { 1, 128, 255, 32 };
-
-            foreach (var item in data.Enumerate())
-            {
-                Assert.AreEqual(stream.Position, item.Index);
-
-                stream.WriteByte(item.Value);
-            }
-
-            Assert.AreEqual(stream.Position, data.Length);
-
-            stream.Position = 0;
-
-            Span<byte> result = stackalloc byte[4];
-
-            foreach (ref byte value in result)
-            {
-                value = checked((byte)stream.ReadByte());
-            }
-
-            Assert.AreEqual(stream.Position, data.Length);
-            Assert.IsTrue(data.SequenceEqual(result));
-
-            Assert.ThrowsException<ArgumentException>(() => stream.WriteByte(128));
-
-            int exitCode = stream.ReadByte();
-
-            Assert.AreEqual(exitCode, -1);
-        }
-
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        public void Test_MemoryStream_ReadWrite_Span()
-        {
-            Stream stream = new byte[100].AsMemory().AsStream();
-
-            Memory<byte> data = CreateRandomData(64);
-
-            // This will use the extension when on .NET Standard 2.0,
-            // as the Stream class doesn't have Spam<T> or Memory<T>
-            // public APIs there. This is the case eg. on UWP as well.
-            stream.Write(data.Span);
-
-            Assert.AreEqual(stream.Position, data.Length);
-
-            stream.Position = 0;
-
-            Span<byte> result = new byte[data.Length];
-
-            int bytesRead = stream.Read(result);
-
-            Assert.AreEqual(bytesRead, result.Length);
-            Assert.AreEqual(stream.Position, data.Length);
-            Assert.IsTrue(data.Span.SequenceEqual(result));
-        }
-
-        [TestCategory("MemoryStream")]
-        [TestMethod]
-        public async Task Test_MemoryStream_ReadWriteAsync_Memory()
-        {
-            Stream stream = new byte[100].AsMemory().AsStream();
-
-            Memory<byte> data = CreateRandomData(64);
-
-            await stream.WriteAsync(data);
-
-            Assert.AreEqual(stream.Position, data.Length);
-
-            stream.Position = 0;
-
-            Memory<byte> result = new byte[data.Length];
-
-            int bytesRead = await stream.ReadAsync(result);
-
-            Assert.AreEqual(bytesRead, result.Length);
-            Assert.AreEqual(stream.Position, data.Length);
-            Assert.IsTrue(data.Span.SequenceEqual(result.Span));
-        }
-
-        /// <summary>
-        /// Creates a random <see cref="byte"/> array filled with random data.
-        /// </summary>
-        /// <param name="count">The number of array items to create.</param>
-        /// <returns>The returned random array.</returns>
-        [Pure]
-        internal static byte[] CreateRandomData(int count)
-        {
-            var random = new Random(DateTime.Now.Ticks.GetHashCode());
-
-            byte[] data = new byte[count];
-
-            foreach (ref byte n in MemoryMarshal.AsBytes(data.AsSpan()))
-            {
-                n = (byte)random.Next(0, byte.MaxValue);
-            }
-
-            return data;
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Test_Box{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Test_Box{T}.cs
deleted file mode 100644
index d5127da9e2b..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Test_Box{T}.cs
+++ /dev/null
@@ -1,104 +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.CodeAnalysis;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_BoxOfT
-    {
-        [TestCategory("BoxOfT")]
-        [TestMethod]
-        public void Test_BoxOfT_PrimitiveTypes()
-        {
-            Test(true, false);
-            Test<byte>(27, 254);
-            Test('a', '$');
-            Test(4221124, 1241241);
-            Test(3.14f, 2342.222f);
-            Test(8394324ul, 1343431241ul);
-            Test(184013.234324, 14124.23423);
-        }
-
-        [TestCategory("BoxOfT")]
-        [TestMethod]
-        public void Test_BoxOfT_OtherTypes()
-        {
-            Test(DateTime.Now, DateTime.FromBinary(278091429014));
-            Test(Guid.NewGuid(), Guid.NewGuid());
-        }
-
-        internal struct TestStruct : IEquatable<TestStruct>
-        {
-            public int Number;
-            public char Character;
-            public string Text;
-
-            /// <inheritdoc/>
-            public bool Equals(TestStruct other)
-            {
-                return
-                    this.Number == other.Number &&
-                    this.Character == other.Character &&
-                    this.Text == other.Text;
-            }
-        }
-
-        [TestCategory("BoxOfT")]
-        [TestMethod]
-        public void TestBoxOfT_CustomStruct()
-        {
-            var a = new TestStruct { Number = 42, Character = 'a', Text = "Hello" };
-            var b = new TestStruct { Number = 38293, Character = 'z', Text = "World" };
-
-            Test(a, b);
-        }
-
-        /// <summary>
-        /// Tests the <see cref="Box{T}"/> type for a given pair of values.
-        /// </summary>
-        /// <typeparam name="T">The type to test.</typeparam>
-        /// <param name="value">The initial <typeparamref name="T"/> value.</param>
-        /// <param name="test">The new <typeparamref name="T"/> value to assign and test.</param>
-        private static void Test<T>(T value, T test)
-            where T : struct, IEquatable<T>
-        {
-            Box<T> box = value;
-
-            Assert.AreEqual(box.GetReference(), value);
-            Assert.AreEqual(box.ToString(), value.ToString());
-            Assert.AreEqual(box.GetHashCode(), value.GetHashCode());
-
-            object obj = value;
-
-            bool success = Box<T>.TryGetFrom(obj, out box);
-
-            Assert.IsTrue(success);
-            Assert.IsTrue(ReferenceEquals(obj, box));
-            Assert.IsNotNull(box);
-            Assert.AreEqual(box.GetReference(), value);
-            Assert.AreEqual(box.ToString(), value.ToString());
-            Assert.AreEqual(box.GetHashCode(), value.GetHashCode());
-
-            box = Box<T>.DangerousGetFrom(obj);
-
-            Assert.IsTrue(ReferenceEquals(obj, box));
-            Assert.AreEqual(box.GetReference(), value);
-            Assert.AreEqual(box.ToString(), value.ToString());
-            Assert.AreEqual(box.GetHashCode(), value.GetHashCode());
-
-            box.GetReference() = test;
-
-            Assert.AreEqual(box.GetReference(), test);
-            Assert.AreEqual(box.ToString(), test.ToString());
-            Assert.AreEqual(box.GetHashCode(), test.GetHashCode());
-            Assert.AreEqual(obj, test);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableReadOnlyRef{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableReadOnlyRef{T}.cs
deleted file mode 100644
index 6f53283273d..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableReadOnlyRef{T}.cs
+++ /dev/null
@@ -1,109 +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.
-
-#if NETCOREAPP3_1 || NET5_0
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_NullableReadOnlyRefOfT
-    {
-        [TestCategory("NullableReadOnlyRefOfT")]
-        [TestMethod]
-        public void Test_NullableReadOnlyRefOfT_CreateNullableReadOnlyRefOfT_Ok()
-        {
-            int value = 1;
-            var reference = new NullableReadOnlyRef<int>(value);
-
-            Assert.IsTrue(reference.HasValue);
-            Assert.IsTrue(Unsafe.AreSame(ref value, ref Unsafe.AsRef(reference.Value)));
-        }
-
-        [TestCategory("NullableReadOnlyRefOfT")]
-        [TestMethod]
-        public void Test_NullableReadOnlyRefOfT_CreateNullableReadOnlyRefOfT_Null()
-        {
-            Assert.IsFalse(default(NullableReadOnlyRef<int>).HasValue);
-            Assert.IsFalse(NullableReadOnlyRef<int>.Null.HasValue);
-
-            Assert.IsFalse(default(NullableReadOnlyRef<string>).HasValue);
-            Assert.IsFalse(NullableReadOnlyRef<string>.Null.HasValue);
-        }
-
-        [TestCategory("NullableReadOnlyRefOfT")]
-        [TestMethod]
-        [ExpectedException(typeof(InvalidOperationException))]
-        public void Test_NullableReadOnlyRefOfT_CreateNullableReadOnlyRefOfT_Null_Exception()
-        {
-            NullableReadOnlyRef<int> reference = default;
-
-            _ = reference.Value;
-        }
-
-        [TestCategory("NullableReadOnlyRefOfT")]
-        [TestMethod]
-        public void Test_NullableReadOnlyRefOfT_CreateNullableReadOnlyRefOfT_ImplicitRefCast()
-        {
-            int value = 42;
-            var reference = new Ref<int>(ref value);
-            NullableReadOnlyRef<int> nullableRef = reference;
-
-            Assert.IsTrue(nullableRef.HasValue);
-            Assert.IsTrue(Unsafe.AreSame(ref reference.Value, ref Unsafe.AsRef(nullableRef.Value)));
-        }
-
-        [TestCategory("NullableReadOnlyRefOfT")]
-        [TestMethod]
-        public void Test_NullableReadOnlyRefOfT_CreateNullableReadOnlyRefOfT_ImplicitReadOnlyRefCast()
-        {
-            int value = 42;
-            var reference = new ReadOnlyRef<int>(value);
-            NullableReadOnlyRef<int> nullableRef = reference;
-
-            Assert.IsTrue(nullableRef.HasValue);
-            Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(reference.Value), ref Unsafe.AsRef(nullableRef.Value)));
-        }
-
-        [TestCategory("NullableReadOnlyRefOfT")]
-        [TestMethod]
-        public void Test_NullableReadOnlyRefOfT_CreateNullableReadOnlyRefOfT_ImplicitNullableRefCast()
-        {
-            int value = 42;
-            var reference = new NullableRef<int>(ref value);
-            NullableReadOnlyRef<int> nullableRef = reference;
-
-            Assert.IsTrue(nullableRef.HasValue);
-            Assert.IsTrue(Unsafe.AreSame(ref reference.Value, ref Unsafe.AsRef(nullableRef.Value)));
-        }
-
-        [TestCategory("NullableReadOnlyRefOfT")]
-        [TestMethod]
-        public void Test_NullableReadOnlyRefOfT_CreateNullableReadOnlyRefOfT_ExplicitCastOfT()
-        {
-            int value = 42;
-            var reference = new NullableRef<int>(ref value);
-
-            Assert.AreEqual(value, (int)reference);
-        }
-
-        [TestCategory("NullableReadOnlyRefOfT")]
-        [TestMethod]
-        [ExpectedException(typeof(InvalidOperationException))]
-        public void Test_NullableReadOnlyRefOfT_CreateNullableReadOnlyRefOfT_ExplicitCastOfT_Exception()
-        {
-            NullableRef<int> invalid = default;
-
-            _ = (int)invalid;
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableRef{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableRef{T}.cs
deleted file mode 100644
index fc0b59734c2..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Test_NullableRef{T}.cs
+++ /dev/null
@@ -1,89 +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.
-
-#if NETCOREAPP3_1 || NET5_0
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_NullableRefOfT
-    {
-        [TestCategory("NullableRefOfT")]
-        [TestMethod]
-        public void Test_NullableRefOfT_CreateNullableRefOfT_Ok()
-        {
-            int value = 1;
-            var reference = new NullableRef<int>(ref value);
-
-            Assert.IsTrue(reference.HasValue);
-            Assert.IsTrue(Unsafe.AreSame(ref value, ref reference.Value));
-
-            reference.Value++;
-
-            Assert.AreEqual(value, 2);
-        }
-
-        [TestCategory("NullableRefOfT")]
-        [TestMethod]
-        public void Test_NullableRefOfT_CreateNullableRefOfT_Null()
-        {
-            Assert.IsFalse(default(NullableRef<int>).HasValue);
-            Assert.IsFalse(NullableRef<int>.Null.HasValue);
-
-            Assert.IsFalse(default(NullableRef<string>).HasValue);
-            Assert.IsFalse(NullableRef<string>.Null.HasValue);
-        }
-
-        [TestCategory("NullableRefOfT")]
-        [TestMethod]
-        [ExpectedException(typeof(InvalidOperationException))]
-        public void Test_NullableRefOfT_CreateNullableRefOfT_Null_Exception()
-        {
-            NullableRef<int> reference = default;
-
-            _ = reference.Value;
-        }
-
-        [TestCategory("NullableRefOfT")]
-        [TestMethod]
-        public void Test_NullableRefOfT_CreateNullableRefOfT_ImplicitRefCast()
-        {
-            int value = 42;
-            var reference = new Ref<int>(ref value);
-            NullableRef<int> nullableRef = reference;
-
-            Assert.IsTrue(nullableRef.HasValue);
-            Assert.IsTrue(Unsafe.AreSame(ref reference.Value, ref nullableRef.Value));
-        }
-
-        [TestCategory("NullableRefOfT")]
-        [TestMethod]
-        public void Test_NullableRefOfT_CreateNullableRefOfT_ExplicitCastOfT()
-        {
-            int value = 42;
-            var reference = new NullableRef<int>(ref value);
-
-            Assert.AreEqual(value, (int)reference);
-        }
-
-        [TestCategory("NullableRefOfT")]
-        [TestMethod]
-        [ExpectedException(typeof(InvalidOperationException))]
-        public void Test_NullableRefOfT_CreateNullableRefOfT_ExplicitCastOfT_Exception()
-        {
-            NullableRef<int> invalid = default;
-
-            _ = (int)invalid;
-        }
-    }
-}
-
-#endif
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Test_ReadOnlyRef{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Test_ReadOnlyRef{T}.cs
deleted file mode 100644
index ca19cdcb375..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Test_ReadOnlyRef{T}.cs
+++ /dev/null
@@ -1,45 +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.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_ReadOnlyRefOfT
-    {
-        [TestCategory("ReadOnlyRefOfT")]
-        [TestMethod]
-#if WINDOWS_UWP
-        public void Test_RefOfT_CreateRefOfT()
-        {
-            var model = new ReadOnlyFieldOwner();
-            var reference = new ReadOnlyRef<int>(model, model.Value);
-
-            Assert.IsTrue(Unsafe.AreSame(ref Unsafe.AsRef(model.Value), ref Unsafe.AsRef(reference.Value)));
-        }
-
-        /// <summary>
-        /// A dummy model that owns an <see cref="int"/> field.
-        /// </summary>
-        private sealed class ReadOnlyFieldOwner
-        {
-            [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401", Justification = "Ref readonly access for tests")]
-            public readonly int Value = 1;
-        }
-#else
-        public void Test_RefOfT_CreateRefOfT()
-        {
-            int value = 1;
-            var reference = new ReadOnlyRef<int>(value);
-
-            Assert.IsTrue(Unsafe.AreSame(ref value, ref Unsafe.AsRef(reference.Value)));
-        }
-#endif
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/Test_Ref{T}.cs b/UnitTests/UnitTests.HighPerformance.Shared/Test_Ref{T}.cs
deleted file mode 100644
index 18ba1a353d5..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/Test_Ref{T}.cs
+++ /dev/null
@@ -1,53 +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.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using Microsoft.Toolkit.HighPerformance;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.HighPerformance
-{
-    [TestClass]
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1649", Justification = "Test class for generic type")]
-    public class Test_RefOfT
-    {
-        [TestCategory("RefOfT")]
-        [TestMethod]
-#if WINDOWS_UWP
-        public void Test_RefOfT_CreateRefOfT()
-        {
-            var model = new FieldOwner { Value = 1 };
-            var reference = new Ref<int>(model, ref model.Value);
-
-            Assert.IsTrue(Unsafe.AreSame(ref model.Value, ref reference.Value));
-
-            reference.Value++;
-
-            Assert.AreEqual(model.Value, 2);
-        }
-
-        /// <summary>
-        /// A dummy model that owns an <see cref="int"/> field.
-        /// </summary>
-        private sealed class FieldOwner
-        {
-            [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401", Justification = "Quick ref access for tests")]
-            public int Value;
-        }
-#else
-        public void Test_RefOfT_CreateRefOfT()
-        {
-            int value = 1;
-            var reference = new Ref<int>(ref value);
-
-            Assert.IsTrue(Unsafe.AreSame(ref value, ref reference.Value));
-
-            reference.Value++;
-
-            Assert.AreEqual(value, 2);
-        }
-#endif
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems b/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems
deleted file mode 100644
index 129408a4013..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.projitems
+++ /dev/null
@@ -1,61 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>9b3a94a6-0d29-4523-880b-6938e2efeef7</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <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" />
-    <Compile Include="$(MSBuildThisFileDirectory)Buffers\Test_StringPool.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Buffers\Test_SpanOwner{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Buffers\TrackingArrayPool{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Enumerables\Test_ReadOnlyRefEnumerable{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Enumerables\Test_RefEnumerable{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions.3D.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions.2D.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayExtensions.1D.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ArrayPoolExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_IMemoryOwnerExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ReadOnlyMemoryExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_MemoryExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_BoolExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_HashCodeExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_IBufferWriterExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_NullableExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_StreamExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_SpanExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ReadOnlySpanExtensions.Count.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_ReadOnlySpanExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_SpinLockExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_StringExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\Test_HashCode{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\Test_ObjectMarshal.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\Test_ParallelHelper.ForEach.Ref2D.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\Test_ParallelHelper.ForEach.In2D.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\Test_ParallelHelper.ThrowExceptions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\Test_ParallelHelper.For.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\Test_ParallelHelper.For2D.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\Test_ParallelHelper.ForEach.In.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\Test_ParallelHelper.ForEach.Ref.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\Test_BitHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Memory\Test_ReadOnlyMemory2D{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Memory\Test_ReadOnlySpan2D{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Memory\Test_Memory2D{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Memory\Test_Span2D{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Streams\Test_IMemoryOwnerStream.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Streams\Test_IBufferWriterStream.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Streams\Test_MemoryStream.ThrowExceptions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Streams\Test_MemoryStream.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Test_Box{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Test_NullableReadOnlyRef{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Test_NullableRef{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Test_Ref{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Test_ReadOnlyRef{T}.cs" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.shproj b/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.shproj
deleted file mode 100644
index 68b653d1cc2..00000000000
--- a/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.shproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>9b3a94a6-0d29-4523-880b-6938e2efeef7</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="UnitTests.HighPerformance.Shared.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/Assets/LockScreenLogo.scale-200.png b/UnitTests/UnitTests.HighPerformance.UWP/Assets/LockScreenLogo.scale-200.png
deleted file mode 100644
index 735f57adb5d..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.UWP/Assets/LockScreenLogo.scale-200.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/Assets/SplashScreen.scale-200.png b/UnitTests/UnitTests.HighPerformance.UWP/Assets/SplashScreen.scale-200.png
deleted file mode 100644
index 023e7f1feda..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.UWP/Assets/SplashScreen.scale-200.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/Assets/Square150x150Logo.scale-200.png b/UnitTests/UnitTests.HighPerformance.UWP/Assets/Square150x150Logo.scale-200.png
deleted file mode 100644
index af49fec1a54..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.UWP/Assets/Square150x150Logo.scale-200.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/Assets/Square44x44Logo.scale-200.png b/UnitTests/UnitTests.HighPerformance.UWP/Assets/Square44x44Logo.scale-200.png
deleted file mode 100644
index ce342a2ec8a..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.UWP/Assets/Square44x44Logo.scale-200.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/UnitTests/UnitTests.HighPerformance.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
deleted file mode 100644
index f6c02ce97e0..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/Assets/StoreLogo.png b/UnitTests/UnitTests.HighPerformance.UWP/Assets/StoreLogo.png
deleted file mode 100644
index 7385b56c0e4..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.UWP/Assets/StoreLogo.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/Assets/Wide310x150Logo.scale-200.png b/UnitTests/UnitTests.HighPerformance.UWP/Assets/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 288995b397f..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.UWP/Assets/Wide310x150Logo.scale-200.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/Package.appxmanifest b/UnitTests/UnitTests.HighPerformance.UWP/Package.appxmanifest
deleted file mode 100644
index e13a868b03e..00000000000
--- a/UnitTests/UnitTests.HighPerformance.UWP/Package.appxmanifest
+++ /dev/null
@@ -1,45 +0,0 @@
-<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="2db00f4f-0cf1-44bd-97ad-2bf93c49958d"
-            Publisher="CN=Microsoft"
-            Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="2db00f4f-0cf1-44bd-97ad-2bf93c49958d" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
-  <Properties>
-    <DisplayName>UnitTests.HighPerformance.UWP</DisplayName>
-    <PublisherDisplayName>Microsoft</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="vstest.executionengine.universal.App"
-        Executable="$targetnametoken$.exe"
-        EntryPoint="UnitTests.HighPerformance.UWP.App">
-      <uap:VisualElements
-        DisplayName="UnitTests.HighPerformance.UWP"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png"
-        Description="UnitTests.HighPerformance.UWP"
-        BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-  <Capabilities>
-    <Capability Name="internetClientServer" />
-    <Capability Name="privateNetworkClientServer" />
-  </Capabilities>
-</Package>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/Properties/AssemblyInfo.cs b/UnitTests/UnitTests.HighPerformance.UWP/Properties/AssemblyInfo.cs
deleted file mode 100644
index d2fa8156284..00000000000
--- a/UnitTests/UnitTests.HighPerformance.UWP/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,21 +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 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("UnitTests.HighPerformance.UWP")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("UnitTests.HighPerformance.UWP")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: AssemblyMetadata("TargetPlatform", "UAP")]
-
-[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/Properties/Default.rd.xml b/UnitTests/UnitTests.HighPerformance.UWP/Properties/Default.rd.xml
deleted file mode 100644
index dc591a4ce9c..00000000000
--- a/UnitTests/UnitTests.HighPerformance.UWP/Properties/Default.rd.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-    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/UnitTests/UnitTests.HighPerformance.UWP/UnitTestApp.xaml b/UnitTests/UnitTests.HighPerformance.UWP/UnitTestApp.xaml
deleted file mode 100644
index 17dc776f611..00000000000
--- a/UnitTests/UnitTests.HighPerformance.UWP/UnitTestApp.xaml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Application
-    x:Class="UnitTests.HighPerformance.UWP.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-</Application>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/UnitTestApp.xaml.cs b/UnitTests/UnitTests.HighPerformance.UWP/UnitTestApp.xaml.cs
deleted file mode 100644
index c82fc389edf..00000000000
--- a/UnitTests/UnitTests.HighPerformance.UWP/UnitTestApp.xaml.cs
+++ /dev/null
@@ -1,53 +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.ApplicationModel.Activation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace UnitTests.HighPerformance.UWP
-{
-    /// <summary>
-    /// Provides application-specific behavior to supplement the default Application class.
-    /// </summary>
-    public sealed partial class App : Application
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="App"/> class.
-        /// </summary>
-        public App()
-        {
-            this.InitializeComponent();
-        }
-
-        /// <inheritdoc/>
-        protected override void OnLaunched(LaunchActivatedEventArgs e)
-        {
-#if DEBUG
-            if (System.Diagnostics.Debugger.IsAttached)
-            {
-                this.DebugSettings.EnableFrameRateCounter = true;
-            }
-#endif
-
-            Frame rootFrame = Window.Current.Content as Frame;
-
-            if (rootFrame == null)
-            {
-                // Create a Frame to act as the navigation context and navigate to the first page
-                rootFrame = new Frame();
-
-                // Place the frame in the current Window
-                Window.Current.Content = rootFrame;
-            }
-
-            Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI();
-
-            // Ensure the current window is active
-            Window.Current.Activate();
-
-            Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(e.Arguments);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj b/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj
deleted file mode 100644
index 9af7e1d429d..00000000000
--- a/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj
+++ /dev/null
@@ -1,173 +0,0 @@
-<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>{5524523E-DB0F-41F7-A0D4-43128422A342}</ProjectGuid>
-    <OutputType>AppContainerExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>UnitTests.HighPerformance.UWP</RootNamespace>
-    <AssemblyName>UnitTests.HighPerformance.UWP</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <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>
-    <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
-    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NoWarn>$(NoWarn);2008</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <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>
-    <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UnitTestApp.xaml.cs">
-      <DependentUpon>UnitTestApp.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="UnitTestApp.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-  </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>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.12</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestAdapter">
-      <Version>2.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="MSTest.TestFramework">
-      <Version>2.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
-      <Version>5.0.0</Version>
-    </PackageReference>
-    <!-- For warnings ILT0010, ILT0005, ILT0003 -->
-    <PackageReference Include="System.Xml.XPath.XmlDocument">
-      <Version>4.0.1</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.HighPerformance\Microsoft.Toolkit.HighPerformance.csproj">
-      <Project>{7e30d48c-4cd8-47be-b557-10a20391dcc4}</Project>
-      <Name>Microsoft.Toolkit.HighPerformance</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="..\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems" Label="Shared" />
-  <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" />
-  <!-- No-op to avoid build error when packing solution from commandline -->
-  <Target Name="Pack" />
-</Project>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.NetCore/Mvvm/Test_ICommandAttribute.cs b/UnitTests/UnitTests.NetCore/Mvvm/Test_ICommandAttribute.cs
deleted file mode 100644
index b1e365974f7..00000000000
--- a/UnitTests/UnitTests.NetCore/Mvvm/Test_ICommandAttribute.cs
+++ /dev/null
@@ -1,118 +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.Diagnostics.CodeAnalysis;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.Input;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-#pragma warning disable SA1124
-
-namespace UnitTests.Mvvm
-{
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1601", Justification = "Type only used for testing")]
-    [TestClass]
-    public partial class Test_ICommandAttribute
-    {
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public async Task Test_ICommandAttribute_RelayCommand()
-        {
-            var model = new MyViewModel();
-
-            Assert.AreEqual(model.Counter, 0);
-
-            model.IncrementCounterCommand.Execute(null);
-
-            Assert.AreEqual(model.Counter, 1);
-
-            model.IncrementCounterWithValueCommand.Execute(5);
-
-            Assert.AreEqual(model.Counter, 6);
-
-            await model.DelayAndIncrementCounterCommand.ExecuteAsync(null);
-
-            Assert.AreEqual(model.Counter, 7);
-
-            await model.DelayAndIncrementCounterWithTokenCommand.ExecuteAsync(null);
-
-            Assert.AreEqual(model.Counter, 8);
-
-            await model.DelayAndIncrementCounterWithValueCommand.ExecuteAsync(5);
-
-            Assert.AreEqual(model.Counter, 13);
-
-            await model.DelayAndIncrementCounterWithValueAndTokenCommand.ExecuteAsync(5);
-
-            Assert.AreEqual(model.Counter, 18);
-        }
-
-        public sealed partial class MyViewModel
-        {
-            public int Counter { get; private set; }
-
-            /// <summary>This is a single line summary.</summary>
-            [ICommand]
-            private void IncrementCounter()
-            {
-                Counter++;
-            }
-
-            /// <summary>
-            /// This is a multiline summary
-            /// </summary>
-            [ICommand]
-            private void IncrementCounterWithValue(int count)
-            {
-                Counter += count;
-            }
-
-            /// <summary>This is single line with also other stuff below</summary>
-            /// <returns>Foo bar baz</returns>
-            /// <returns>A task</returns>
-            [ICommand]
-            private async Task DelayAndIncrementCounterAsync()
-            {
-                await Task.Delay(50);
-
-                Counter += 1;
-            }
-
-            #region Test region
-
-            /// <summary>
-            /// This is multi line with also other stuff below
-            /// </summary>
-            /// <returns>Foo bar baz</returns>
-            /// <returns>A task</returns>
-            [ICommand]
-            private async Task DelayAndIncrementCounterWithTokenAsync(CancellationToken token)
-            {
-                await Task.Delay(50);
-
-                Counter += 1;
-            }
-
-            // This should not be ported over
-            [ICommand]
-            private async Task DelayAndIncrementCounterWithValueAsync(int count)
-            {
-                await Task.Delay(50);
-
-                Counter += count;
-            }
-
-            #endregion
-
-            [ICommand]
-            private async Task DelayAndIncrementCounterWithValueAndTokenAsync(int count, CancellationToken token)
-            {
-                await Task.Delay(50);
-
-                Counter += count;
-            }
-        }
-    }
-}
diff --git a/UnitTests/UnitTests.NetCore/Mvvm/Test_INotifyPropertyChangedAttribute.cs b/UnitTests/UnitTests.NetCore/Mvvm/Test_INotifyPropertyChangedAttribute.cs
deleted file mode 100644
index 6c0583e282f..00000000000
--- a/UnitTests/UnitTests.NetCore/Mvvm/Test_INotifyPropertyChangedAttribute.cs
+++ /dev/null
@@ -1,131 +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.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Mvvm
-{
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1601", Justification = "Type only used for testing")]
-    [TestClass]
-    public partial class Test_INotifyPropertyChangedAttribute
-    {
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_INotifyPropertyChanged_Events()
-        {
-            var model = new SampleModel();
-
-            (PropertyChangedEventArgs, int) changed = default;
-
-            model.PropertyChanged += (s, e) =>
-            {
-                Assert.IsNull(changed.Item1);
-                Assert.AreSame(model, s);
-                Assert.IsNotNull(s);
-                Assert.IsNotNull(e);
-
-                changed = (e, model.Data);
-            };
-
-            model.Data = 42;
-
-            Assert.AreEqual(changed.Item1?.PropertyName, nameof(SampleModel.Data));
-            Assert.AreEqual(changed.Item2, 42);
-        }
-
-        [INotifyPropertyChanged]
-        public partial class SampleModel
-        {
-            private int data;
-
-            public int Data
-            {
-                get => data;
-                set => SetProperty(ref data, value);
-            }
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_INotifyPropertyChanged_WithoutHelpers()
-        {
-            Assert.IsTrue(typeof(INotifyPropertyChanged).IsAssignableFrom(typeof(SampleModelWithoutHelpers)));
-            Assert.IsFalse(typeof(INotifyPropertyChanging).IsAssignableFrom(typeof(SampleModelWithoutHelpers)));
-
-            // This just needs to check that it compiles
-            _ = nameof(SampleModelWithoutHelpers.PropertyChanged);
-
-            var methods = typeof(SampleModelWithoutHelpers).GetMethods(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.DeclaredOnly);
-
-            Assert.AreEqual(methods.Length, 2);
-            Assert.AreEqual(methods[0].Name, "OnPropertyChanged");
-            Assert.AreEqual(methods[1].Name, "OnPropertyChanged");
-
-            var types = typeof(SampleModelWithoutHelpers).GetNestedTypes(BindingFlags.NonPublic);
-
-            Assert.AreEqual(types.Length, 0);
-        }
-
-        [INotifyPropertyChanged(IncludeAdditionalHelperMethods = false)]
-        public partial class SampleModelWithoutHelpers
-        {
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_INotifyPropertyChanged_WithGeneratedProperties()
-        {
-            Assert.IsTrue(typeof(INotifyPropertyChanged).IsAssignableFrom(typeof(SampleModelWithINPCAndObservableProperties)));
-            Assert.IsFalse(typeof(INotifyPropertyChanging).IsAssignableFrom(typeof(SampleModelWithINPCAndObservableProperties)));
-
-            SampleModelWithINPCAndObservableProperties model = new();
-            List<PropertyChangedEventArgs> eventArgs = new();
-
-            model.PropertyChanged += (s, e) => eventArgs.Add(e);
-
-            model.X = 42;
-            model.Y = 66;
-
-            Assert.AreEqual(eventArgs.Count, 2);
-            Assert.AreEqual(eventArgs[0].PropertyName, nameof(SampleModelWithINPCAndObservableProperties.X));
-            Assert.AreEqual(eventArgs[1].PropertyName, nameof(SampleModelWithINPCAndObservableProperties.Y));
-        }
-
-        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4167
-        [INotifyPropertyChanged]
-        public partial class SampleModelWithINPCAndObservableProperties
-        {
-            [ObservableProperty]
-            private int x;
-
-            [ObservableProperty]
-            private int y;
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_INotifyPropertyChanged_WithGeneratedProperties_ExternalNetStandard20Assembly()
-        {
-            Assert.IsTrue(typeof(INotifyPropertyChanged).IsAssignableFrom(typeof(NetStandard.SampleModelWithINPCAndObservableProperties)));
-            Assert.IsFalse(typeof(INotifyPropertyChanging).IsAssignableFrom(typeof(NetStandard.SampleModelWithINPCAndObservableProperties)));
-
-            NetStandard.SampleModelWithINPCAndObservableProperties model = new();
-            List<PropertyChangedEventArgs> eventArgs = new();
-
-            model.PropertyChanged += (s, e) => eventArgs.Add(e);
-
-            model.X = 42;
-            model.Y = 66;
-
-            Assert.AreEqual(eventArgs.Count, 2);
-            Assert.AreEqual(eventArgs[0].PropertyName, nameof(NetStandard.SampleModelWithINPCAndObservableProperties.X));
-            Assert.AreEqual(eventArgs[1].PropertyName, nameof(NetStandard.SampleModelWithINPCAndObservableProperties.Y));
-        }
-    }
-}
diff --git a/UnitTests/UnitTests.NetCore/Mvvm/Test_IRecipientGenerator.cs b/UnitTests/UnitTests.NetCore/Mvvm/Test_IRecipientGenerator.cs
deleted file mode 100644
index 9227d603619..00000000000
--- a/UnitTests/UnitTests.NetCore/Mvvm/Test_IRecipientGenerator.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.
-
-#pragma warning disable CS0618
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.Toolkit.Mvvm.Messaging;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Mvvm
-{
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1601", Justification = "Type only used for testing")]
-    [TestClass]
-    public partial class Test_IRecipientGenerator
-    {
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_IRecipientGenerator_GeneratedRegistration()
-        {
-            var messenger = new StrongReferenceMessenger();
-            var recipient = new RecipientWithSomeMessages();
-
-            var messageA = new MessageA();
-            var messageB = new MessageB();
-
-            Action<IMessenger, object, int> registrator = Microsoft.Toolkit.Mvvm.Messaging.__Internals.__IMessengerExtensions.CreateAllMessagesRegistratorWithToken<int>(recipient);
-
-            registrator(messenger, recipient, 42);
-
-            Assert.IsTrue(messenger.IsRegistered<MessageA, int>(recipient, 42));
-            Assert.IsTrue(messenger.IsRegistered<MessageB, int>(recipient, 42));
-
-            Assert.IsNull(recipient.A);
-            Assert.IsNull(recipient.B);
-
-            messenger.Send(messageA, 42);
-
-            Assert.AreSame(recipient.A, messageA);
-            Assert.IsNull(recipient.B);
-
-            messenger.Send(messageB, 42);
-
-            Assert.AreSame(recipient.A, messageA);
-            Assert.AreSame(recipient.B, messageB);
-        }
-
-        public sealed class RecipientWithSomeMessages :
-            IRecipient<MessageA>,
-            IRecipient<MessageB>
-        {
-            public MessageA A { get; private set; }
-
-            public MessageB B { get; private set; }
-
-            public void Receive(MessageA message)
-            {
-                A = message;
-            }
-
-            public void Receive(MessageB message)
-            {
-                B = message;
-            }
-        }
-
-        public sealed class MessageA
-        {
-        }
-
-        public sealed class MessageB
-        {
-        }
-    }
-}
diff --git a/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservableObjectAttribute.cs b/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservableObjectAttribute.cs
deleted file mode 100644
index 98b40ecf6ec..00000000000
--- a/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservableObjectAttribute.cs
+++ /dev/null
@@ -1,118 +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.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Mvvm
-{
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1601", Justification = "Type only used for testing")]
-    [TestClass]
-    public partial class Test_ObservableObjectAttribute
-    {
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableObjectAttribute_Events()
-        {
-            var model = new SampleModel();
-
-            (PropertyChangingEventArgs, int) changing = default;
-            (PropertyChangedEventArgs, int) changed = default;
-
-            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);
-            };
-
-            model.Data = 42;
-
-            Assert.AreEqual(changing.Item1?.PropertyName, nameof(SampleModel.Data));
-            Assert.AreEqual(changing.Item2, 0);
-            Assert.AreEqual(changed.Item1?.PropertyName, nameof(SampleModel.Data));
-            Assert.AreEqual(changed.Item2, 42);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableObjectAttribute_OnSealedClass_Events()
-        {
-            var model = new SampleModelSealed();
-
-            (PropertyChangingEventArgs, int) changing = default;
-            (PropertyChangedEventArgs, int) changed = default;
-
-            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);
-            };
-
-            model.Data = 42;
-
-            Assert.AreEqual(changing.Item1?.PropertyName, nameof(SampleModelSealed.Data));
-            Assert.AreEqual(changing.Item2, 0);
-            Assert.AreEqual(changed.Item1?.PropertyName, nameof(SampleModelSealed.Data));
-            Assert.AreEqual(changed.Item2, 42);
-        }
-
-        [ObservableObject]
-        public partial class SampleModel
-        {
-            private int data;
-
-            public int Data
-            {
-                get => data;
-                set => SetProperty(ref data, value);
-            }
-        }
-
-        [ObservableObject]
-        public sealed partial class SampleModelSealed
-        {
-            private int data;
-
-            public int Data
-            {
-                get => data;
-                set => SetProperty(ref data, value);
-            }
-        }
-    }
-}
diff --git a/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservablePropertyAttribute.cs b/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservablePropertyAttribute.cs
deleted file mode 100644
index c51dee590c7..00000000000
--- a/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservablePropertyAttribute.cs
+++ /dev/null
@@ -1,394 +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.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reflection;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-#pragma warning disable SA1124, SA1307, SA1401
-
-#nullable enable
-
-namespace UnitTests.Mvvm
-{
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1601", Justification = "Type only used for testing")]
-    [TestClass]
-    public partial class Test_ObservablePropertyAttribute
-    {
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservablePropertyAttribute_Events()
-        {
-            var model = new SampleModel();
-
-            (PropertyChangingEventArgs, int) changing = default;
-            (PropertyChangedEventArgs, int) changed = default;
-
-            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);
-            };
-
-            model.Data = 42;
-
-            Assert.AreEqual(changing.Item1?.PropertyName, nameof(SampleModel.Data));
-            Assert.AreEqual(changing.Item2, 0);
-            Assert.AreEqual(changed.Item1?.PropertyName, nameof(SampleModel.Data));
-            Assert.AreEqual(changed.Item2, 42);
-        }
-
-        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4225
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservablePropertyAttributeWithinRegion_Events()
-        {
-            var model = new SampleModel();
-
-            (PropertyChangingEventArgs, int) changing = default;
-            (PropertyChangedEventArgs, int) changed = default;
-
-            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.Counter);
-            };
-
-            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.Counter);
-            };
-
-            model.Counter = 42;
-
-            Assert.AreEqual(changing.Item1?.PropertyName, nameof(SampleModel.Counter));
-            Assert.AreEqual(changing.Item2, 0);
-            Assert.AreEqual(changed.Item1?.PropertyName, nameof(SampleModel.Counter));
-            Assert.AreEqual(changed.Item2, 42);
-        }
-
-        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4225
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservablePropertyAttributeRightBelowRegion_Events()
-        {
-            var model = new SampleModel();
-
-            (PropertyChangingEventArgs, string?) changing = default;
-            (PropertyChangedEventArgs, string?) changed = default;
-
-            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.Name);
-            };
-
-            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.Name);
-            };
-
-            model.Name = "Bob";
-
-            Assert.AreEqual(changing.Item1?.PropertyName, nameof(SampleModel.Name));
-            Assert.AreEqual(changing.Item2, null);
-            Assert.AreEqual(changed.Item1?.PropertyName, nameof(SampleModel.Name));
-            Assert.AreEqual(changed.Item2, "Bob");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_AlsoNotifyChangeForAttribute_Events()
-        {
-            var model = new DependentPropertyModel();
-
-            List<string?> propertyNames = new();
-
-            model.PropertyChanged += (s, e) => propertyNames.Add(e.PropertyName);
-
-            model.Name = "Bob";
-            model.Surname = "Ross";
-
-            CollectionAssert.AreEqual(new[] { nameof(model.Name), nameof(model.FullName), nameof(model.Alias), nameof(model.Surname), nameof(model.FullName), nameof(model.Alias) }, propertyNames);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ValidationAttributes()
-        {
-            var nameProperty = typeof(MyFormViewModel).GetProperty(nameof(MyFormViewModel.Name))!;
-
-            Assert.IsNotNull(nameProperty.GetCustomAttribute<RequiredAttribute>());
-            Assert.IsNotNull(nameProperty.GetCustomAttribute<MinLengthAttribute>());
-            Assert.AreEqual(nameProperty.GetCustomAttribute<MinLengthAttribute>()!.Length, 1);
-            Assert.IsNotNull(nameProperty.GetCustomAttribute<MaxLengthAttribute>());
-            Assert.AreEqual(nameProperty.GetCustomAttribute<MaxLengthAttribute>()!.Length, 100);
-
-            var ageProperty = typeof(MyFormViewModel).GetProperty(nameof(MyFormViewModel.Age))!;
-
-            Assert.IsNotNull(ageProperty.GetCustomAttribute<RangeAttribute>());
-            Assert.AreEqual(ageProperty.GetCustomAttribute<RangeAttribute>()!.Minimum, 0);
-            Assert.AreEqual(ageProperty.GetCustomAttribute<RangeAttribute>()!.Maximum, 120);
-
-            var emailProperty = typeof(MyFormViewModel).GetProperty(nameof(MyFormViewModel.Email))!;
-
-            Assert.IsNotNull(emailProperty.GetCustomAttribute<EmailAddressAttribute>());
-
-            var comboProperty = typeof(MyFormViewModel).GetProperty(nameof(MyFormViewModel.IfThisWorksThenThatsGreat))!;
-
-            TestValidationAttribute testAttribute = comboProperty.GetCustomAttribute<TestValidationAttribute>()!;
-
-            Assert.IsNotNull(testAttribute);
-            Assert.IsNull(testAttribute.O);
-            Assert.AreEqual(testAttribute.T, typeof(SampleModel));
-            Assert.AreEqual(testAttribute.Flag, true);
-            Assert.AreEqual(testAttribute.D, 6.28);
-            CollectionAssert.AreEqual(testAttribute.Names, new[] { "Bob", "Ross" });
-
-            object[]? nestedArray = (object[]?)testAttribute.NestedArray;
-
-            Assert.IsNotNull(nestedArray);
-            Assert.AreEqual(nestedArray!.Length, 3);
-            Assert.AreEqual(nestedArray[0], 1);
-            Assert.AreEqual(nestedArray[1], "Hello");
-            Assert.IsTrue(nestedArray[2] is int[]);
-            CollectionAssert.AreEqual((int[])nestedArray[2], new[] { 2, 3, 4 });
-
-            Assert.AreEqual(testAttribute.Animal, Animal.Llama);
-        }
-
-        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4216
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservablePropertyWithValueNamedField()
-        {
-            var model = new ModelWithValueProperty();
-
-            List<string?> propertyNames = new();
-
-            model.PropertyChanged += (s, e) => propertyNames.Add(e.PropertyName);
-
-            model.Value = "Hello world";
-
-            Assert.AreEqual(model.Value, "Hello world");
-
-            CollectionAssert.AreEqual(new[] { nameof(model.Value) }, propertyNames);
-        }
-
-        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4216
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservablePropertyWithValueNamedField_WithValidationAttributes()
-        {
-            var model = new ModelWithValuePropertyWithValidation();
-
-            List<string?> propertyNames = new();
-
-            model.PropertyChanged += (s, e) => propertyNames.Add(e.PropertyName);
-
-            model.Value = "Hello world";
-
-            Assert.AreEqual(model.Value, "Hello world");
-
-            CollectionAssert.AreEqual(new[] { nameof(model.Value) }, propertyNames);
-        }
-
-        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4184
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_GeneratedPropertiesWithValidationAttributesOverFields()
-        {
-            var model = new ViewModelWithValidatableGeneratedProperties();
-
-            List<string?> propertyNames = new();
-
-            model.PropertyChanged += (s, e) => propertyNames.Add(e.PropertyName);
-
-            // Assign these fields directly to bypass the validation that is executed in the generated setters.
-            // We only need those generated properties to be there to check whether they are correctly detected.
-            model.first = "A";
-            model.last = "This is a very long name that exceeds the maximum length of 60 for this property";
-
-            Assert.IsFalse(model.HasErrors);
-
-            model.RunValidation();
-
-            Assert.IsTrue(model.HasErrors);
-
-            ValidationResult[] validationErrors = model.GetErrors().ToArray();
-
-            Assert.AreEqual(validationErrors.Length, 2);
-
-            CollectionAssert.AreEqual(new[] { nameof(ViewModelWithValidatableGeneratedProperties.First) }, validationErrors[0].MemberNames.ToArray());
-            CollectionAssert.AreEqual(new[] { nameof(ViewModelWithValidatableGeneratedProperties.Last) }, validationErrors[1].MemberNames.ToArray());
-        }
-
-        public partial class SampleModel : ObservableObject
-        {
-            /// <summary>
-            /// This is a sample data field within <see cref="SampleModel"/> of type <see cref="int"/>.
-            /// </summary>
-            [ObservableProperty]
-            private int data;
-
-            #region More properties
-
-            [ObservableProperty]
-            private int counter;
-
-            #endregion
-
-            [ObservableProperty]
-            private string? name;
-        }
-
-        [INotifyPropertyChanged]
-        public sealed partial class DependentPropertyModel
-        {
-            [ObservableProperty]
-            [AlsoNotifyChangeFor(nameof(FullName))]
-            [AlsoNotifyChangeFor(nameof(Alias))]
-            private string? name;
-
-            [ObservableProperty]
-            [AlsoNotifyChangeFor(nameof(FullName), nameof(Alias))]
-            private string? surname;
-
-            public string FullName => $"{Name} {Surname}";
-
-            public string Alias => $"{Name?.ToLower()}{Surname?.ToLower()}";
-        }
-
-        public partial class MyFormViewModel : ObservableValidator
-        {
-            [ObservableProperty]
-            [Required]
-            [MinLength(1)]
-            [MaxLength(100)]
-            private string? name;
-
-            [ObservableProperty]
-            [Range(0, 120)]
-            private int age;
-
-            [ObservableProperty]
-            [EmailAddress]
-            private string? email;
-
-            [ObservableProperty]
-            [TestValidation(null, typeof(SampleModel), true, 6.28, new[] { "Bob", "Ross" }, NestedArray = new object[] { 1, "Hello", new int[] { 2, 3, 4 } }, Animal = Animal.Llama)]
-            private int ifThisWorksThenThatsGreat;
-        }
-
-        private sealed class TestValidationAttribute : ValidationAttribute
-        {
-            public TestValidationAttribute(object? o, Type t, bool flag, double d, string[] names)
-            {
-                O = o;
-                T = t;
-                Flag = flag;
-                D = d;
-                Names = names;
-            }
-
-            public object? O { get; }
-
-            public Type T { get; }
-
-            public bool Flag { get; }
-
-            public double D { get; }
-
-            public string[] Names { get; }
-
-            public object? NestedArray { get; set; }
-
-            public Animal Animal { get; set; }
-        }
-
-        public enum Animal
-        {
-            Cat,
-            Dog,
-            Llama
-        }
-
-        public partial class ModelWithValueProperty : ObservableObject
-        {
-            [ObservableProperty]
-            private string? value;
-        }
-
-        public partial class ModelWithValuePropertyWithValidation : ObservableValidator
-        {
-            [ObservableProperty]
-            [Required]
-            [MinLength(5)]
-            private string? value;
-        }
-
-        public partial class ViewModelWithValidatableGeneratedProperties : ObservableValidator
-        {
-            [Required]
-            [MinLength(2)]
-            [MaxLength(60)]
-            [Display(Name = "FirstName")]
-            [ObservableProperty]
-            public string first = "Bob";
-
-            [Display(Name = "LastName")]
-            [Required]
-            [MinLength(2)]
-            [MaxLength(60)]
-            [ObservableProperty]
-            public string last = "Jones";
-
-            public void RunValidation() => ValidateAllProperties();
-        }
-    }
-}
diff --git a/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservableRecipientAttribute.cs b/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservableRecipientAttribute.cs
deleted file mode 100644
index a6689ae4869..00000000000
--- a/UnitTests/UnitTests.NetCore/Mvvm/Test_ObservableRecipientAttribute.cs
+++ /dev/null
@@ -1,106 +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.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reflection;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.Messaging;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Mvvm
-{
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1601", Justification = "Type only used for testing")]
-    [TestClass]
-    public partial class Test_ObservableRecipientAttribute
-    {
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableRecipientAttribute_Events()
-        {
-            var model = new Person();
-            var args = new List<PropertyChangedEventArgs>();
-
-            model.PropertyChanged += (s, e) => args.Add(e);
-
-            Assert.IsFalse(model.HasErrors);
-
-            model.Name = "No";
-
-            Assert.IsTrue(model.HasErrors);
-            Assert.AreEqual(args.Count, 2);
-            Assert.AreEqual(args[0].PropertyName, nameof(Person.Name));
-            Assert.AreEqual(args[1].PropertyName, nameof(INotifyDataErrorInfo.HasErrors));
-
-            model.Name = "Valid";
-
-            Assert.IsFalse(model.HasErrors);
-            Assert.AreEqual(args.Count, 4);
-            Assert.AreEqual(args[2].PropertyName, nameof(Person.Name));
-            Assert.AreEqual(args[3].PropertyName, nameof(INotifyDataErrorInfo.HasErrors));
-
-            Assert.IsNotNull(typeof(Person).GetProperty("Messenger", BindingFlags.Instance | BindingFlags.NonPublic));
-            Assert.AreEqual(typeof(Person).GetConstructors(BindingFlags.Instance | BindingFlags.NonPublic).Length, 0);
-        }
-
-        [ObservableRecipient]
-        public partial class Person : ObservableValidator
-        {
-            public Person()
-            {
-                Messenger = WeakReferenceMessenger.Default;
-            }
-
-            private string name;
-
-            [MinLength(4)]
-            [MaxLength(20)]
-            [Required]
-            public string Name
-            {
-                get => this.name;
-                set => SetProperty(ref this.name, value, true);
-            }
-
-            public void TestCompile()
-            {
-                // Validates that the method Broadcast is correctly being generated
-                Broadcast(0, 1, nameof(TestCompile));
-            }
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableRecipientAttribute_AbstractConstructors()
-        {
-            var ctors = typeof(AbstractPerson).GetConstructors(BindingFlags.Instance | BindingFlags.NonPublic);
-
-            Assert.AreEqual(ctors.Length, 2);
-            Assert.IsTrue(ctors.All(static ctor => ctor.IsFamily));
-        }
-
-        [ObservableRecipient]
-        public abstract partial class AbstractPerson : ObservableObject
-        {
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableRecipientAttribute_NonAbstractConstructors()
-        {
-            var ctors = typeof(NonAbstractPerson).GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
-
-            Assert.AreEqual(ctors.Length, 2);
-            Assert.IsTrue(ctors.All(static ctor => ctor.IsPublic));
-        }
-
-        [ObservableRecipient]
-        public partial class NonAbstractPerson : ObservableObject
-        {
-        }
-    }
-}
diff --git a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
deleted file mode 100644
index 9921a87b1a9..00000000000
--- a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj
+++ /dev/null
@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Microsoft.Toolkit\Microsoft.Toolkit.csproj" />
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj" />
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Diagnostics\Microsoft.Toolkit.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm.SourceGenerators\Microsoft.Toolkit.Mvvm.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="contentfiles;build" />
-    <ProjectReference Include="..\UnitTests.NetStandard\UnitTests.NetStandard.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
-  </ItemGroup>
-
-  <!-- Workaround for the .NET Core 2.1 binary not resolving the Unsafe assembly properly -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
-  </ItemGroup>
-
-  <Import Project="..\UnitTests.Shared\UnitTests.Shared.projitems" Label="Shared" />
-
-</Project>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.NetStandard/SampleModelWithINPCAndObservableProperties.cs b/UnitTests/UnitTests.NetStandard/SampleModelWithINPCAndObservableProperties.cs
deleted file mode 100644
index d571eea9f44..00000000000
--- a/UnitTests/UnitTests.NetStandard/SampleModelWithINPCAndObservableProperties.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.
-
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-namespace UnitTests.NetStandard
-{
-    /// <summary>
-    /// See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4167.
-    /// This model in particular is loaded from an external .NET Standard 2.0 assembly.
-    /// </summary>
-    [INotifyPropertyChanged]
-    public partial class SampleModelWithINPCAndObservableProperties
-    {
-        [ObservableProperty]
-        private int x;
-
-        [ObservableProperty]
-        private int y;
-    }
-}
diff --git a/UnitTests/UnitTests.NetStandard/UnitTests.NetStandard.csproj b/UnitTests/UnitTests.NetStandard/UnitTests.NetStandard.csproj
deleted file mode 100644
index 2f33f86d89c..00000000000
--- a/UnitTests/UnitTests.NetStandard/UnitTests.NetStandard.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj" />
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm.SourceGenerators\Microsoft.Toolkit.Mvvm.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="contentfiles;build" />
-  </ItemGroup>
-
-</Project>
diff --git a/UnitTests/UnitTests.Shared/.editorconfig b/UnitTests/UnitTests.Shared/.editorconfig
deleted file mode 100644
index 9f4e6518a99..00000000000
--- a/UnitTests/UnitTests.Shared/.editorconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# Analyzer Configurations for Unit Test sources
-
-# C# Source Files
-[*.cs]
-
-# A C# partial element is missing a documentation header.
-dotnet_diagnostic.SA1601.severity = none
-
-# The Parameter has no matching param tag in the XML comment.
-dotnet_diagnostic.CS1573.severity = none
-
-# Missing XML comment for publicly visible type or member.
-dotnet_diagnostic.CS1591.severity = none
-
-# The Type parameter has no matching typeparam tag in the XML comment.
-dotnet_diagnostic.CS1712.severity = none
diff --git a/UnitTests/UnitTests.Shared/Collections/IntGroup.cs b/UnitTests/UnitTests.Shared/Collections/IntGroup.cs
deleted file mode 100644
index 6cd69e881e0..00000000000
--- a/UnitTests/UnitTests.Shared/Collections/IntGroup.cs
+++ /dev/null
@@ -1,20 +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.Linq;
-
-namespace UnitTests.Collections
-{
-    public class IntGroup : List<int>, IGrouping<string, int>
-    {
-        public IntGroup(string key, IEnumerable<int> collection)
-            : base(collection)
-        {
-            Key = key;
-        }
-
-        public string Key { get; }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Collections/ObservableGroupTests.cs b/UnitTests/UnitTests.Shared/Collections/ObservableGroupTests.cs
deleted file mode 100644
index b14415df525..00000000000
--- a/UnitTests/UnitTests.Shared/Collections/ObservableGroupTests.cs
+++ /dev/null
@@ -1,125 +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.Specialized;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.Toolkit.Collections;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Collections
-{
-    [TestClass]
-    public class ObservableGroupTests
-    {
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Ctor_ShouldHaveExpectedState()
-        {
-            var group = new ObservableGroup<string, int>("key");
-
-            group.Key.Should().Be("key");
-            group.Should().BeEmpty();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Ctor_WithGrouping_ShouldHaveExpectedState()
-        {
-            var source = new IntGroup("Key", new[] { 1, 2, 3 });
-            var group = new ObservableGroup<string, int>(source);
-
-            group.Key.Should().Be("Key");
-            group.Should().BeEquivalentTo(new[] { 1, 2, 3 }, option => option.WithStrictOrdering());
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Ctor_WithCollection_ShouldHaveExpectedState()
-        {
-            var source = new[] { 1, 2, 3 };
-            var group = new ObservableGroup<string, int>("key", source);
-
-            group.Key.Should().Be("key");
-            group.Should().BeEquivalentTo(new[] { 1, 2, 3 }, option => option.WithStrictOrdering());
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Add_ShouldRaiseEvent()
-        {
-            var collectionChangedEventRaised = false;
-            var source = new[] { 1, 2, 3 };
-            var group = new ObservableGroup<string, int>("key", source);
-            ((INotifyCollectionChanged)group).CollectionChanged += (s, e) => collectionChangedEventRaised = true;
-
-            group.Add(4);
-
-            group.Key.Should().Be("key");
-            group.Should().BeEquivalentTo(new[] { 1, 2, 3, 4 }, option => option.WithStrictOrdering());
-            collectionChangedEventRaised.Should().BeTrue();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Update_ShouldRaiseEvent()
-        {
-            var collectionChangedEventRaised = false;
-            var source = new[] { 1, 2, 3 };
-            var group = new ObservableGroup<string, int>("key", source);
-            ((INotifyCollectionChanged)group).CollectionChanged += (s, e) => collectionChangedEventRaised = true;
-
-            group[1] = 4;
-
-            group.Key.Should().Be("key");
-            group.Should().BeEquivalentTo(new[] { 1, 4, 3 }, option => option.WithStrictOrdering());
-            collectionChangedEventRaised.Should().BeTrue();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Remove_ShouldRaiseEvent()
-        {
-            var collectionChangedEventRaised = false;
-            var source = new[] { 1, 2, 3 };
-            var group = new ObservableGroup<string, int>("key", source);
-            ((INotifyCollectionChanged)group).CollectionChanged += (s, e) => collectionChangedEventRaised = true;
-
-            group.Remove(1);
-
-            group.Key.Should().Be("key");
-            group.Should().BeEquivalentTo(new[] { 2, 3 }, option => option.WithStrictOrdering());
-            collectionChangedEventRaised.Should().BeTrue();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Clear_ShouldRaiseEvent()
-        {
-            var collectionChangedEventRaised = false;
-            var source = new[] { 1, 2, 3 };
-            var group = new ObservableGroup<string, int>("key", source);
-            ((INotifyCollectionChanged)group).CollectionChanged += (s, e) => collectionChangedEventRaised = true;
-
-            group.Clear();
-
-            group.Key.Should().Be("key");
-            group.Should().BeEmpty();
-            collectionChangedEventRaised.Should().BeTrue();
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(0)]
-        [DataRow(3)]
-        public void IReadOnlyObservableGroup_ShouldReturnExpectedValues(int count)
-        {
-            var group = new ObservableGroup<string, int>("key", Enumerable.Range(0, count));
-            var iReadOnlyObservableGroup = (IReadOnlyObservableGroup)group;
-
-            iReadOnlyObservableGroup.Key.Should().Be("key");
-            iReadOnlyObservableGroup.Count.Should().Be(count);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionExtensionsTests.cs b/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionExtensionsTests.cs
deleted file mode 100644
index cf21f12849a..00000000000
--- a/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionExtensionsTests.cs
+++ /dev/null
@@ -1,539 +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 FluentAssertions;
-using Microsoft.Toolkit.Collections;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Collections
-{
-    [TestClass]
-    public class ObservableGroupedCollectionExtensionsTests
-    {
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void First_WhenGroupExists_ShouldReturnFirstGroup()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 23);
-            var target = groupedCollection.AddGroup("B", 10);
-            groupedCollection.AddGroup("B", 42);
-
-            var result = groupedCollection.First("B");
-
-            result.Should().BeSameAs(target);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void First_WhenGroupDoesNotExist_ShouldThrow()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 23);
-
-            Action action = () => groupedCollection.First("I do not exist");
-
-            action.Should().Throw<InvalidOperationException>();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void FirstOrDefault_WhenGroupExists_ShouldReturnFirstGroup()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 23);
-            var target = groupedCollection.AddGroup("B", 10);
-            groupedCollection.AddGroup("B", 42);
-
-            var result = groupedCollection.FirstOrDefault("B");
-
-            result.Should().BeSameAs(target);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void FirstOrDefault_WhenGroupDoesNotExist_ShouldReturnNull()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 23);
-
-            var result = groupedCollection.FirstOrDefault("I do not exist");
-
-            result.Should().BeNull();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void ElementAt_WhenGroupExistsAndIndexInRange_ShouldReturnFirstGroupValue()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 23);
-            groupedCollection.AddGroup("B", 10, 11, 12);
-            groupedCollection.AddGroup("B", 42);
-
-            var result = groupedCollection.ElementAt("B", 2);
-
-            result.Should().Be(12);
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(-1)]
-        [DataRow(3)]
-        public void ElementAt_WhenGroupExistsAndIndexOutOfRange_ShouldReturnThrow(int index)
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 23);
-            groupedCollection.AddGroup("B", 10, 11, 12);
-            groupedCollection.AddGroup("B", 42);
-
-            Action action = () => groupedCollection.ElementAt("B", index);
-
-            action.Should().Throw<ArgumentException>();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void ElementAt_WhenGroupDoesNotExist_ShouldThrow()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 23);
-
-            Action action = () => groupedCollection.ElementAt("I do not exist", 0);
-
-            action.Should().Throw<InvalidOperationException>();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void ElementAtOrDefault_WhenGroupExistsAndIndexInRange_ShouldReturnValue()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 23);
-            groupedCollection.AddGroup("B", 10, 11, 12);
-            groupedCollection.AddGroup("B", 42);
-
-            var result = groupedCollection.ElementAt("B", 2);
-
-            result.Should().Be(12);
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(-1)]
-        [DataRow(3)]
-        public void ElementAtOrDefault_WhenGroupExistsAndIndexOutOfRange_ShouldReturnDefaultValue(int index)
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 23);
-            groupedCollection.AddGroup("B", 10, 11, 12);
-            groupedCollection.AddGroup("B", 42);
-
-            var result = groupedCollection.ElementAtOrDefault("B", index);
-
-            result.Should().Be(0);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void ElementAtOrDefault_WhenGroupDoesNotExist_ShouldReturnDefaultValue()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 23);
-
-            var result = groupedCollection.ElementAtOrDefault("I do not exist", 0);
-
-            result.Should().Be(0);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void AddGroup_WithItem_ShouldAddGroup()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-
-            var addedGroup = groupedCollection.AddGroup("new key", 23);
-
-            addedGroup.Should().NotBeNull();
-            addedGroup.Key.Should().Be("new key");
-            addedGroup.Should().ContainSingle();
-            addedGroup.Should().ContainInOrder(23);
-
-            groupedCollection.Should().ContainSingle();
-            groupedCollection.Should().HaveElementAt(0, addedGroup);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void AddGroup_WithCollection_ShouldAddGroup()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-
-            var addedGroup = groupedCollection.AddGroup("new key", new[] { 23, 10, 42 });
-
-            addedGroup.Should().NotBeNull();
-            addedGroup.Key.Should().Be("new key");
-            addedGroup.Should().HaveCount(3);
-            addedGroup.Should().ContainInOrder(23, 10, 42);
-
-            groupedCollection.Should().ContainSingle();
-            groupedCollection.Should().HaveElementAt(0, addedGroup);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void AddGroup_WithParamsCollection_ShouldAddGroup()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-
-            var addedGroup = groupedCollection.AddGroup("new key", 23, 10, 42);
-
-            addedGroup.Should().NotBeNull();
-            addedGroup.Key.Should().Be("new key");
-            addedGroup.Should().HaveCount(3);
-            addedGroup.Should().ContainInOrder(23, 10, 42);
-
-            groupedCollection.Should().ContainSingle();
-            groupedCollection.Should().HaveElementAt(0, addedGroup);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void AddItem_WhenTargetGroupDoesNotExists_ShouldCreateAndAddNewGroup()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-
-            var addedGroup = groupedCollection.AddItem("new key", 23);
-
-            addedGroup.Should().NotBeNull();
-            addedGroup.Key.Should().Be("new key");
-            addedGroup.Should().ContainSingle();
-            addedGroup.Should().ContainInOrder(23);
-
-            groupedCollection.Should().ContainSingle();
-            groupedCollection.Should().HaveElementAt(0, addedGroup);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void AddItem_WhenSingleTargetGroupAlreadyExists_ShouldAddItemToExistingGroup()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 1, 2, 3);
-            var targetGroup = groupedCollection.AddGroup("B", 4, 5, 6);
-            groupedCollection.AddGroup("C", 7, 8);
-
-            var addedGroup = groupedCollection.AddItem("B", 23);
-
-            addedGroup.Should().BeSameAs(targetGroup);
-            addedGroup.Key.Should().Be("B");
-            addedGroup.Should().HaveCount(4);
-            addedGroup.Should().ContainInOrder(4, 5, 6, 23);
-
-            groupedCollection.Should().HaveCount(3);
-            groupedCollection.ElementAt(0).Key.Should().Be("A");
-            groupedCollection.ElementAt(0).Should().HaveCount(3);
-            groupedCollection.ElementAt(0).Should().ContainInOrder(1, 2, 3);
-
-            groupedCollection.ElementAt(1).Key.Should().Be("B");
-            groupedCollection.ElementAt(1).Should().HaveCount(4);
-            groupedCollection.ElementAt(1).Should().ContainInOrder(4, 5, 6, 23);
-
-            groupedCollection.ElementAt(2).Key.Should().Be("C");
-            groupedCollection.ElementAt(2).Should().HaveCount(2);
-            groupedCollection.ElementAt(2).Should().ContainInOrder(7, 8);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void AddItem_WhenSeveralTargetGroupsAlreadyExist_ShouldAddItemToFirstExistingGroup()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 1, 2, 3);
-            var targetGroup = groupedCollection.AddGroup("B", 4, 5, 6);
-            groupedCollection.AddGroup("B", 7, 8, 9);
-            groupedCollection.AddGroup("C", 10, 11);
-
-            var addedGroup = groupedCollection.AddItem("B", 23);
-
-            addedGroup.Should().BeSameAs(targetGroup);
-            addedGroup.Key.Should().Be("B");
-            addedGroup.Should().HaveCount(4);
-            addedGroup.Should().ContainInOrder(4, 5, 6, 23);
-
-            groupedCollection.Should().HaveCount(4);
-            groupedCollection.ElementAt(0).Key.Should().Be("A");
-            groupedCollection.ElementAt(0).Should().HaveCount(3);
-            groupedCollection.ElementAt(0).Should().ContainInOrder(1, 2, 3);
-
-            groupedCollection.ElementAt(1).Key.Should().Be("B");
-            groupedCollection.ElementAt(1).Should().HaveCount(4);
-            groupedCollection.ElementAt(1).Should().ContainInOrder(4, 5, 6, 23);
-
-            groupedCollection.ElementAt(2).Key.Should().Be("B");
-            groupedCollection.ElementAt(2).Should().HaveCount(3);
-            groupedCollection.ElementAt(2).Should().ContainInOrder(7, 8, 9);
-
-            groupedCollection.ElementAt(3).Key.Should().Be("C");
-            groupedCollection.ElementAt(3).Should().HaveCount(2);
-            groupedCollection.ElementAt(3).Should().ContainInOrder(10, 11);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void InsertItem_WhenGroupDoesNotExist_ShouldThrow()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 1, 2, 3);
-
-            Action action = () => groupedCollection.InsertItem("I do not exist", 0, 23);
-
-            action.Should().Throw<InvalidOperationException>();
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(-1)]
-        [DataRow(4)]
-        public void InsertItem_WhenIndexOutOfRange_ShouldThrow(int index)
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 1, 2, 3);
-
-            Action action = () => groupedCollection.InsertItem("A", index, 23);
-
-            action.Should().Throw<ArgumentOutOfRangeException>();
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(0, new[] { 23, 1, 2, 3 })]
-        [DataRow(1, new[] { 1, 23, 2, 3 })]
-        [DataRow(3, new[] { 1, 2, 3, 23 })]
-        public void InsertItem_WithValidIndex_WithSeveralGroups_ShoudInsertItemInFirstGroup(int index, int[] expecteGroupValues)
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 4, 5);
-            var targetGroup = groupedCollection.AddGroup("B", 1, 2, 3);
-            groupedCollection.AddGroup("B", 6, 7);
-
-            var group = groupedCollection.InsertItem("B", index, 23);
-
-            group.Should().BeSameAs(targetGroup);
-
-            groupedCollection.Should().HaveCount(3);
-            groupedCollection.ElementAt(0).Key.Should().Be("A");
-            groupedCollection.ElementAt(0).Should().HaveCount(2);
-            groupedCollection.ElementAt(0).Should().ContainInOrder(4, 5);
-
-            groupedCollection.ElementAt(1).Key.Should().Be("B");
-            groupedCollection.ElementAt(1).Should().HaveCount(4);
-            groupedCollection.ElementAt(1).Should().ContainInOrder(expecteGroupValues);
-
-            groupedCollection.ElementAt(2).Key.Should().Be("B");
-            groupedCollection.ElementAt(2).Should().HaveCount(2);
-            groupedCollection.ElementAt(2).Should().ContainInOrder(6, 7);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void SetItem_WhenGroupDoesNotExist_ShouldThrow()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 1, 2, 3);
-
-            Action action = () => groupedCollection.SetItem("I do not exist", 0, 23);
-
-            action.Should().Throw<InvalidOperationException>();
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(-1)]
-        [DataRow(3)]
-        public void SetItem_WhenIndexOutOfRange_ShouldThrow(int index)
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 1, 2, 3);
-
-            Action action = () => groupedCollection.SetItem("A", index, 23);
-
-            action.Should().Throw<ArgumentOutOfRangeException>();
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(0, new[] { 23, 2, 3 })]
-        [DataRow(1, new[] { 1, 23, 3 })]
-        [DataRow(2, new[] { 1, 2, 23 })]
-        public void SetItem_WithValidIndex_WithSeveralGroups_ShouldReplaceItemInFirstGroup(int index, int[] expectedGroupValues)
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 4, 5);
-            var targetGroup = groupedCollection.AddGroup("B", 1, 2, 3);
-            groupedCollection.AddGroup("B", 6, 7);
-
-            var group = groupedCollection.SetItem("B", index, 23);
-
-            group.Should().BeSameAs(targetGroup);
-
-            groupedCollection.Should().HaveCount(3);
-            groupedCollection.ElementAt(0).Key.Should().Be("A");
-            groupedCollection.ElementAt(0).Should().HaveCount(2);
-            groupedCollection.ElementAt(0).Should().ContainInOrder(4, 5);
-
-            groupedCollection.ElementAt(1).Key.Should().Be("B");
-            groupedCollection.ElementAt(1).Should().HaveCount(3);
-            groupedCollection.ElementAt(1).Should().ContainInOrder(expectedGroupValues);
-
-            groupedCollection.ElementAt(2).Key.Should().Be("B");
-            groupedCollection.ElementAt(2).Should().HaveCount(2);
-            groupedCollection.ElementAt(2).Should().ContainInOrder(6, 7);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void RemoveGroup_WhenGroupDoesNotExists_ShouldDoNothing()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 1, 2, 3);
-
-            groupedCollection.RemoveGroup("I do not exist");
-
-            groupedCollection.Should().ContainSingle();
-            groupedCollection.ElementAt(0).Key.Should().Be("A");
-            groupedCollection.ElementAt(0).Should().HaveCount(3);
-            groupedCollection.ElementAt(0).Should().ContainInOrder(1, 2, 3);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void RemoveGroup_WhenSingleGroupExists_ShouldRemoveGroup()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 1, 2, 3);
-            groupedCollection.AddGroup("B", 4, 5, 6);
-
-            groupedCollection.RemoveGroup("B");
-
-            groupedCollection.Should().ContainSingle();
-            groupedCollection.ElementAt(0).Key.Should().Be("A");
-            groupedCollection.ElementAt(0).Should().HaveCount(3);
-            groupedCollection.ElementAt(0).Should().ContainInOrder(1, 2, 3);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void RemoveGroup_WhenSeveralGroupsExist_ShouldRemoveFirstGroup()
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 1, 2, 3);
-            groupedCollection.AddGroup("B", 4, 5, 6);
-            groupedCollection.AddGroup("B", 7, 8);
-
-            groupedCollection.RemoveGroup("B");
-
-            groupedCollection.Should().HaveCount(2);
-            groupedCollection.ElementAt(0).Key.Should().Be("A");
-            groupedCollection.ElementAt(0).Should().HaveCount(3);
-            groupedCollection.ElementAt(0).Should().ContainInOrder(1, 2, 3);
-
-            groupedCollection.ElementAt(1).Key.Should().Be("B");
-            groupedCollection.ElementAt(1).Should().HaveCount(2);
-            groupedCollection.ElementAt(1).Should().ContainInOrder(7, 8);
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(true)]
-        [DataRow(false)]
-        public void RemoveItem_WhenGroupDoesNotExist_ShouldDoNothing(bool removeGroupIfEmpty)
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 1, 2, 3);
-            groupedCollection.AddGroup("B", 4, 5, 6);
-
-            groupedCollection.RemoveItem("I do not exist", 8, removeGroupIfEmpty);
-
-            groupedCollection.Should().HaveCount(2);
-            groupedCollection.ElementAt(0).Key.Should().Be("A");
-            groupedCollection.ElementAt(0).Should().HaveCount(3);
-            groupedCollection.ElementAt(0).Should().ContainInOrder(1, 2, 3);
-
-            groupedCollection.ElementAt(1).Key.Should().Be("B");
-            groupedCollection.ElementAt(1).Should().HaveCount(3);
-            groupedCollection.ElementAt(1).Should().ContainInOrder(4, 5, 6);
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(true)]
-        [DataRow(false)]
-        public void RemoveItem_WhenGroupExistsAndItemDoesNotExist_ShouldDoNothing(bool removeGroupIfEmpty)
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 1, 2, 3);
-            groupedCollection.AddGroup("B", 4, 5, 6);
-
-            groupedCollection.RemoveItem("B", 8, removeGroupIfEmpty);
-
-            groupedCollection.Should().HaveCount(2);
-            groupedCollection.ElementAt(0).Key.Should().Be("A");
-            groupedCollection.ElementAt(0).Should().HaveCount(3);
-            groupedCollection.ElementAt(0).Should().ContainInOrder(1, 2, 3);
-
-            groupedCollection.ElementAt(1).Key.Should().Be("B");
-            groupedCollection.ElementAt(1).Should().HaveCount(3);
-            groupedCollection.ElementAt(1).Should().ContainInOrder(4, 5, 6);
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(true)]
-        [DataRow(false)]
-        public void RemoveItem_WhenGroupAndItemExist_ShouldRemoveItemFromGroup(bool removeGroupIfEmpty)
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 1, 2, 3);
-            groupedCollection.AddGroup("B", 4, 5, 6);
-
-            groupedCollection.RemoveItem("B", 5, removeGroupIfEmpty);
-
-            groupedCollection.Should().HaveCount(2);
-            groupedCollection.ElementAt(0).Key.Should().Be("A");
-            groupedCollection.ElementAt(0).Should().HaveCount(3);
-            groupedCollection.ElementAt(0).Should().ContainInOrder(1, 2, 3);
-
-            groupedCollection.ElementAt(1).Key.Should().Be("B");
-            groupedCollection.ElementAt(1).Should().HaveCount(2);
-            groupedCollection.ElementAt(1).Should().ContainInOrder(4, 6);
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(true, true)]
-        [DataRow(false, false)]
-        public void RemoveItem_WhenRemovingLastItem_ShouldRemoveGroupIfRequired(bool removeGroupIfEmpty, bool expectGroupRemoved)
-        {
-            var groupedCollection = new ObservableGroupedCollection<string, int>();
-            groupedCollection.AddGroup("A", 1, 2, 3);
-            groupedCollection.AddGroup("B", 4);
-
-            groupedCollection.RemoveItem("B", 4, removeGroupIfEmpty);
-
-            groupedCollection.Should().HaveCount(expectGroupRemoved ? 1 : 2);
-            groupedCollection.ElementAt(0).Key.Should().Be("A");
-            groupedCollection.ElementAt(0).Should().HaveCount(3);
-            groupedCollection.ElementAt(0).Should().ContainInOrder(1, 2, 3);
-
-            if (!expectGroupRemoved)
-            {
-                groupedCollection.ElementAt(1).Key.Should().Be("B");
-                groupedCollection.ElementAt(1).Should().BeEmpty();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionTests.cs b/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionTests.cs
deleted file mode 100644
index ba40d04aefb..00000000000
--- a/UnitTests/UnitTests.Shared/Collections/ObservableGroupedCollectionTests.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.Linq;
-using FluentAssertions;
-using Microsoft.Toolkit.Collections;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Collections
-{
-    [TestClass]
-    public class ObservableGroupedCollectionTests
-    {
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Ctor_ShouldHaveExpectedValues()
-        {
-            var groupCollection = new ObservableGroupedCollection<string, int>();
-
-            groupCollection.Should().BeEmpty();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Ctor_WithGroups_ShouldHaveExpectedValues()
-        {
-            var groups = new List<IGrouping<string, int>>
-            {
-                new IntGroup("A", new[] { 1, 3, 5 }),
-                new IntGroup("B", new[] { 2, 4, 6 }),
-            };
-            var groupCollection = new ObservableGroupedCollection<string, int>(groups);
-
-            groupCollection.Should().HaveCount(2);
-            groupCollection.ElementAt(0).Key.Should().Be("A");
-            groupCollection.ElementAt(0).Should().BeEquivalentTo(new[] { 1, 3, 5 }, o => o.WithStrictOrdering());
-            groupCollection.ElementAt(1).Key.Should().Be("B");
-            groupCollection.ElementAt(1).Should().BeEquivalentTo(new[] { 2, 4, 6 }, o => o.WithStrictOrdering());
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupTests.cs b/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupTests.cs
deleted file mode 100644
index 773dc17e326..00000000000
--- a/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupTests.cs
+++ /dev/null
@@ -1,133 +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.ObjectModel;
-using System.Collections.Specialized;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.Toolkit.Collections;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Collections
-{
-    [TestClass]
-    public class ReadOnlyObservableGroupTests
-    {
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Ctor_WithKeyAndOBservableCollection_ShouldHaveExpectedInitialState()
-        {
-            var source = new ObservableCollection<int>(new[] { 1, 2, 3 });
-            var group = new ReadOnlyObservableGroup<string, int>("key", source);
-
-            group.Key.Should().Be("key");
-            group.Should().BeEquivalentTo(new[] { 1, 2, 3 }, option => option.WithStrictOrdering());
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Ctor_ObservableGroup_ShouldHaveExpectedInitialState()
-        {
-            var source = new[] { 1, 2, 3 };
-            var sourceGroup = new ObservableGroup<string, int>("key", source);
-            var group = new ReadOnlyObservableGroup<string, int>(sourceGroup);
-
-            group.Key.Should().Be("key");
-            group.Should().BeEquivalentTo(new[] { 1, 2, 3 }, option => option.WithStrictOrdering());
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Ctor_WithKeyAndCollection_ShouldHaveExpectedInitialState()
-        {
-            var source = new[] { 1, 2, 3 };
-            var group = new ReadOnlyObservableGroup<string, int>("key", source);
-
-            group.Key.Should().Be("key");
-            group.Should().BeEquivalentTo(new[] { 1, 2, 3 }, option => option.WithStrictOrdering());
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Add_ShouldRaiseEvent()
-        {
-            var collectionChangedEventRaised = false;
-            var source = new[] { 1, 2, 3 };
-            var sourceGroup = new ObservableGroup<string, int>("key", source);
-            var group = new ReadOnlyObservableGroup<string, int>(sourceGroup);
-            ((INotifyCollectionChanged)group).CollectionChanged += (s, e) => collectionChangedEventRaised = true;
-
-            sourceGroup.Add(4);
-
-            group.Key.Should().Be("key");
-            group.Should().BeEquivalentTo(new[] { 1, 2, 3, 4 }, option => option.WithStrictOrdering());
-            collectionChangedEventRaised.Should().BeTrue();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Update_ShouldRaiseEvent()
-        {
-            var collectionChangedEventRaised = false;
-            var source = new[] { 1, 2, 3 };
-            var sourceGroup = new ObservableGroup<string, int>("key", source);
-            var group = new ReadOnlyObservableGroup<string, int>(sourceGroup);
-            ((INotifyCollectionChanged)group).CollectionChanged += (s, e) => collectionChangedEventRaised = true;
-
-            sourceGroup[1] = 4;
-
-            group.Key.Should().Be("key");
-            group.Should().BeEquivalentTo(new[] { 1, 4, 3 }, option => option.WithStrictOrdering());
-            collectionChangedEventRaised.Should().BeTrue();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Remove_ShouldRaiseEvent()
-        {
-            var collectionChangedEventRaised = false;
-            var source = new[] { 1, 2, 3 };
-            var sourceGroup = new ObservableGroup<string, int>("key", source);
-            var group = new ReadOnlyObservableGroup<string, int>(sourceGroup);
-            ((INotifyCollectionChanged)group).CollectionChanged += (s, e) => collectionChangedEventRaised = true;
-
-            sourceGroup.Remove(1);
-
-            group.Key.Should().Be("key");
-            group.Should().BeEquivalentTo(new[] { 2, 3 }, option => option.WithStrictOrdering());
-            collectionChangedEventRaised.Should().BeTrue();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Clear_ShouldRaiseEvent()
-        {
-            var collectionChangedEventRaised = false;
-            var source = new[] { 1, 2, 3 };
-            var sourceGroup = new ObservableGroup<string, int>("key", source);
-            var group = new ReadOnlyObservableGroup<string, int>(sourceGroup);
-            ((INotifyCollectionChanged)group).CollectionChanged += (s, e) => collectionChangedEventRaised = true;
-
-            sourceGroup.Clear();
-
-            group.Key.Should().Be("key");
-            group.Should().BeEmpty();
-            collectionChangedEventRaised.Should().BeTrue();
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(0)]
-        [DataRow(3)]
-        public void IReadOnlyObservableGroup_ShouldReturnExpectedValues(int count)
-        {
-            var sourceGroup = new ObservableGroup<string, int>("key", Enumerable.Range(0, count));
-            var group = new ReadOnlyObservableGroup<string, int>(sourceGroup);
-            var iReadOnlyObservableGroup = (IReadOnlyObservableGroup)group;
-
-            iReadOnlyObservableGroup.Key.Should().Be("key");
-            iReadOnlyObservableGroup.Count.Should().Be(count);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupedCollectionTests.cs b/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupedCollectionTests.cs
deleted file mode 100644
index 28c7fb0fe4a..00000000000
--- a/UnitTests/UnitTests.Shared/Collections/ReadOnlyObservableGroupedCollectionTests.cs
+++ /dev/null
@@ -1,472 +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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
-using FluentAssertions;
-using Microsoft.Toolkit.Collections;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Collections
-{
-    [TestClass]
-    public class ReadOnlyObservableGroupedCollectionTests
-    {
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Ctor_WithEmptySource_ShoudInitializeObject()
-        {
-            var source = new ObservableGroupedCollection<string, int>();
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-
-            readOnlyGroup.Should().BeEmpty();
-            readOnlyGroup.Count.Should().Be(0);
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Ctor_WithObservableGroupedCollection_ShoudInitializeObject()
-        {
-            var groups = new List<IGrouping<string, int>>
-            {
-                new IntGroup("A", new[] { 1, 3, 5 }),
-                new IntGroup("B", new[] { 2, 4, 6 }),
-            };
-            var source = new ObservableGroupedCollection<string, int>(groups);
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-
-            readOnlyGroup.Should().HaveCount(2);
-            readOnlyGroup.Count.Should().Be(2);
-            readOnlyGroup.ElementAt(0).Key.Should().Be("A");
-            readOnlyGroup.ElementAt(0).Should().BeEquivalentTo(new[] { 1, 3, 5 }, o => o.WithoutStrictOrdering());
-            readOnlyGroup.ElementAt(1).Key.Should().Be("B");
-            readOnlyGroup.ElementAt(1).Should().BeEquivalentTo(new[] { 2, 4, 6 }, o => o.WithoutStrictOrdering());
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Ctor_WithListOfIGroupingSource_ShoudInitializeObject()
-        {
-            var source = new List<IGrouping<string, int>>
-            {
-                new IntGroup("A", new[] { 1, 3, 5 }),
-                new IntGroup("B", new[] { 2, 4, 6 }),
-            };
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-
-            readOnlyGroup.Should().HaveCount(2);
-            readOnlyGroup.Count.Should().Be(2);
-            readOnlyGroup.ElementAt(0).Key.Should().Be("A");
-            readOnlyGroup.ElementAt(0).Should().BeEquivalentTo(new[] { 1, 3, 5 }, o => o.WithoutStrictOrdering());
-            readOnlyGroup.ElementAt(1).Key.Should().Be("B");
-            readOnlyGroup.ElementAt(1).Should().BeEquivalentTo(new[] { 2, 4, 6 }, o => o.WithoutStrictOrdering());
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void Ctor_WithListOfReadOnlyObservableGroupSource_ShoudInitializeObject()
-        {
-            var source = new List<ReadOnlyObservableGroup<string, int>>
-            {
-                new ReadOnlyObservableGroup<string, int>("A", new[] { 1, 3, 5 }),
-                new ReadOnlyObservableGroup<string, int>("B", new[] { 2, 4, 6 }),
-            };
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-
-            readOnlyGroup.Should().HaveCount(2);
-            readOnlyGroup.Count.Should().Be(2);
-            readOnlyGroup.ElementAt(0).Key.Should().Be("A");
-            readOnlyGroup.ElementAt(0).Should().BeEquivalentTo(new[] { 1, 3, 5 }, o => o.WithoutStrictOrdering());
-            readOnlyGroup.ElementAt(1).Key.Should().Be("B");
-            readOnlyGroup.ElementAt(1).Should().BeEquivalentTo(new[] { 2, 4, 6 }, o => o.WithoutStrictOrdering());
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void IListImplementation_Properties_ShoudReturnExpectedValues()
-        {
-            var groups = new List<IGrouping<string, int>>
-            {
-                new IntGroup("A", new[] { 1, 3, 5 }),
-                new IntGroup("B", new[] { 2, 4, 6 }),
-            };
-            var source = new ObservableGroupedCollection<string, int>(groups);
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-            var list = (IList)readOnlyGroup;
-
-            list.Count.Should().Be(2);
-            var group0 = (ReadOnlyObservableGroup<string, int>)list[0];
-            group0.Key.Should().Be("A");
-            group0.Should().BeEquivalentTo(new[] { 1, 3, 5 }, o => o.WithoutStrictOrdering());
-            var group1 = (ReadOnlyObservableGroup<string, int>)list[1];
-            group1.Key.Should().Be("B");
-            group1.Should().BeEquivalentTo(new[] { 2, 4, 6 }, o => o.WithoutStrictOrdering());
-
-            list.SyncRoot.Should().NotBeNull();
-            list.IsFixedSize.Should().BeTrue();
-            list.IsReadOnly.Should().BeTrue();
-            list.IsSynchronized.Should().BeFalse();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void IListImplementation_MutableMethods_ShoudThrow()
-        {
-            var groups = new List<IGrouping<string, int>>
-            {
-                new IntGroup("A", new[] { 1, 3, 5 }),
-                new IntGroup("B", new[] { 2, 4, 6 }),
-            };
-            var source = new ObservableGroupedCollection<string, int>(groups);
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-            var list = (IList)readOnlyGroup;
-
-            var testGroup = new ReadOnlyObservableGroup<string, int>("test", new ObservableCollection<int>());
-            Action add = () => list.Add(testGroup);
-            add.Should().Throw<NotSupportedException>();
-
-            Action clear = () => list.Clear();
-            clear.Should().Throw<NotSupportedException>();
-
-            Action insert = () => list.Insert(2, testGroup);
-            insert.Should().Throw<NotSupportedException>();
-
-            Action remove = () => list.Remove(testGroup);
-            remove.Should().Throw<NotSupportedException>();
-
-            Action removeAt = () => list.RemoveAt(2);
-            removeAt.Should().Throw<NotSupportedException>();
-
-            Action set = () => list[2] = testGroup;
-            set.Should().Throw<NotSupportedException>();
-
-            var array = new object[5];
-            Action copyTo = () => list.CopyTo(array, 0);
-            copyTo.Should().NotThrow();
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(-1)]
-        [DataRow(0)]
-        [DataRow(1)]
-        [DataRow(2)]
-        public void IListImplementation_IndexOf_ShoudReturnExpectedValue(int groupIndex)
-        {
-            var groups = new List<IGrouping<string, int>>
-            {
-                new IntGroup("A", new[] { 1, 3, 5 }),
-                new IntGroup("B", new[] { 2, 4, 6 }),
-                new IntGroup("C", new[] { 7, 8, 9 }),
-            };
-            var source = new ObservableGroupedCollection<string, int>(groups);
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-            var list = (IList)readOnlyGroup;
-
-            var groupToSearch = groupIndex >= 0 ? list[groupIndex] : null;
-
-            var index = list.IndexOf(groupToSearch);
-
-            index.Should().Be(groupIndex);
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(-1, false)]
-        [DataRow(0, true)]
-        [DataRow(1, true)]
-        public void IListImplementation_Contains_ShoudReturnExpectedValue(int groupIndex, bool expectedResult)
-        {
-            var groups = new List<IGrouping<string, int>>
-            {
-                new IntGroup("A", new[] { 1, 3, 5 }),
-                new IntGroup("B", new[] { 2, 4, 6 }),
-            };
-            var source = new ObservableGroupedCollection<string, int>(groups);
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-            var list = (IList)readOnlyGroup;
-
-            var groupToSearch = groupIndex >= 0 ? list[groupIndex] : null;
-
-            var result = list.Contains(groupToSearch);
-
-            result.Should().Be(expectedResult);
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(0, 0)]
-        [DataRow(3, 3)]
-        public void AddGroupInSource_ShouldAddGroup(int sourceInitialItemsCount, int expectedInsertionIndex)
-        {
-            NotifyCollectionChangedEventArgs collectionChangedEventArgs = null;
-            var collectionChangedEventsCount = 0;
-            var isCountPropertyChangedEventRaised = false;
-            var itemsList = new[] { 1, 2, 3 };
-            var source = new ObservableGroupedCollection<string, int>();
-            for (var i = 0; i < sourceInitialItemsCount; i++)
-            {
-                source.Add(new ObservableGroup<string, int>($"group {i}", Enumerable.Empty<int>()));
-            }
-
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-            ((INotifyCollectionChanged)readOnlyGroup).CollectionChanged += (s, e) =>
-            {
-                collectionChangedEventArgs = e;
-                collectionChangedEventsCount++;
-            };
-            ((INotifyPropertyChanged)readOnlyGroup).PropertyChanged += (s, e) => isCountPropertyChangedEventRaised = isCountPropertyChangedEventRaised || e.PropertyName == nameof(readOnlyGroup.Count);
-
-            source.Add(new ObservableGroup<string, int>("Add", itemsList));
-
-            var expectedReadOnlyGroupCount = sourceInitialItemsCount + 1;
-            readOnlyGroup.Should().HaveCount(expectedReadOnlyGroupCount);
-            readOnlyGroup.Count.Should().Be(expectedReadOnlyGroupCount);
-            readOnlyGroup.Last().Key.Should().Be("Add");
-            readOnlyGroup.Last().Should().BeEquivalentTo(itemsList, o => o.WithoutStrictOrdering());
-
-            isCountPropertyChangedEventRaised.Should().BeTrue();
-            collectionChangedEventArgs.Should().NotBeNull();
-            collectionChangedEventsCount.Should().Be(1);
-            IsAddEventValid(collectionChangedEventArgs, itemsList, expectedInsertionIndex).Should().BeTrue();
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(0)]
-        [DataRow(1)]
-        [DataRow(2)]
-        public void InsertGroupInSource_ShouldAddGroup(int insertionIndex)
-        {
-            NotifyCollectionChangedEventArgs collectionChangedEventArgs = null;
-            var collectionChangedEventsCount = 0;
-            var isCountPropertyChangedEventRaised = false;
-            var itemsList = new[] { 1, 2, 3 };
-            var source = new ObservableGroupedCollection<string, int>
-            {
-                new ObservableGroup<string, int>("Group0", new[] { 10, 20, 30 }),
-                new ObservableGroup<string, int>("Group1", new[] { 40, 50, 60 })
-            };
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-            ((INotifyCollectionChanged)readOnlyGroup).CollectionChanged += (s, e) =>
-            {
-                collectionChangedEventArgs = e;
-                collectionChangedEventsCount++;
-            };
-            ((INotifyPropertyChanged)readOnlyGroup).PropertyChanged += (s, e) => isCountPropertyChangedEventRaised = isCountPropertyChangedEventRaised || e.PropertyName == nameof(readOnlyGroup.Count);
-
-            source.Insert(insertionIndex, new ObservableGroup<string, int>("Add", itemsList));
-
-            readOnlyGroup.Should().HaveCount(3);
-            readOnlyGroup.Count.Should().Be(3);
-            readOnlyGroup.ElementAt(insertionIndex).Key.Should().Be("Add");
-            readOnlyGroup.ElementAt(insertionIndex).Should().BeEquivalentTo(itemsList, o => o.WithoutStrictOrdering());
-
-            isCountPropertyChangedEventRaised.Should().BeTrue();
-            collectionChangedEventArgs.Should().NotBeNull();
-            collectionChangedEventsCount.Should().Be(1);
-            IsAddEventValid(collectionChangedEventArgs, itemsList, addIndex: insertionIndex).Should().BeTrue();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void RemoveGroupInSource_ShoudRemoveGroup()
-        {
-            NotifyCollectionChangedEventArgs collectionChangedEventArgs = null;
-            var collectionChangedEventsCount = 0;
-            var isCountPropertyChangedEventRaised = false;
-            var aItemsList = new[] { 1, 2, 3 };
-            var bItemsList = new[] { 2, 4, 6 };
-            var groups = new List<IGrouping<string, int>>
-            {
-                new IntGroup("A", aItemsList),
-                new IntGroup("B", bItemsList),
-            };
-            var source = new ObservableGroupedCollection<string, int>(groups);
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-            ((INotifyCollectionChanged)readOnlyGroup).CollectionChanged += (s, e) =>
-            {
-                collectionChangedEventArgs = e;
-                collectionChangedEventsCount++;
-            };
-            ((INotifyPropertyChanged)readOnlyGroup).PropertyChanged += (s, e) => isCountPropertyChangedEventRaised = isCountPropertyChangedEventRaised || e.PropertyName == nameof(readOnlyGroup.Count);
-
-            source.RemoveAt(1);
-
-            readOnlyGroup.Should().ContainSingle();
-            readOnlyGroup.Count.Should().Be(1);
-            readOnlyGroup.ElementAt(0).Key.Should().Be("A");
-            readOnlyGroup.ElementAt(0).Should().BeEquivalentTo(aItemsList, o => o.WithoutStrictOrdering());
-
-            isCountPropertyChangedEventRaised.Should().BeTrue();
-            collectionChangedEventArgs.Should().NotBeNull();
-            collectionChangedEventsCount.Should().Be(1);
-            IsRemoveEventValid(collectionChangedEventArgs, bItemsList, 1).Should().BeTrue();
-        }
-
-        [TestCategory("Collections")]
-        [DataTestMethod]
-        [DataRow(1, 0)]
-        [DataRow(0, 1)]
-        public void MoveGroupInSource_ShoudMoveGroup(int oldIndex, int newIndex)
-        {
-            NotifyCollectionChangedEventArgs collectionChangedEventArgs = null;
-            var collectionChangedEventsCount = 0;
-            var isCountPropertyChangedEventRaised = false;
-            var aItemsList = new[] { 1, 2, 3 };
-            var bItemsList = new[] { 2, 4, 6 };
-            var groups = new List<IGrouping<string, int>>
-            {
-                new IntGroup("A", aItemsList),
-                new IntGroup("B", bItemsList),
-            };
-            var source = new ObservableGroupedCollection<string, int>(groups);
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-            ((INotifyCollectionChanged)readOnlyGroup).CollectionChanged += (s, e) =>
-            {
-                collectionChangedEventArgs = e;
-                collectionChangedEventsCount++;
-            };
-            ((INotifyPropertyChanged)readOnlyGroup).PropertyChanged += (s, e) => isCountPropertyChangedEventRaised = isCountPropertyChangedEventRaised || e.PropertyName == nameof(readOnlyGroup.Count);
-
-            source.Move(oldIndex, newIndex);
-
-            readOnlyGroup.Should().HaveCount(2);
-            readOnlyGroup.Count.Should().Be(2);
-            readOnlyGroup.ElementAt(0).Key.Should().Be("B");
-            readOnlyGroup.ElementAt(0).Should().BeEquivalentTo(bItemsList, o => o.WithoutStrictOrdering());
-            readOnlyGroup.ElementAt(1).Key.Should().Be("A");
-            readOnlyGroup.ElementAt(1).Should().BeEquivalentTo(aItemsList, o => o.WithoutStrictOrdering());
-
-            isCountPropertyChangedEventRaised.Should().BeFalse();
-            collectionChangedEventArgs.Should().NotBeNull();
-            collectionChangedEventsCount.Should().Be(1);
-            IsMoveEventValid(collectionChangedEventArgs, groups[oldIndex], oldIndex, newIndex).Should().BeTrue();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void ClearSource_ShoudClear()
-        {
-            NotifyCollectionChangedEventArgs collectionChangedEventArgs = null;
-            var collectionChangedEventsCount = 0;
-            var isCountPropertyChangedEventRaised = false;
-            var aItemsList = new[] { 1, 2, 3 };
-            var bItemsList = new[] { 2, 4, 6 };
-            var groups = new List<IGrouping<string, int>>
-            {
-                new IntGroup("A", aItemsList),
-                new IntGroup("B", bItemsList),
-            };
-            var source = new ObservableGroupedCollection<string, int>(groups);
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-            ((INotifyCollectionChanged)readOnlyGroup).CollectionChanged += (s, e) =>
-            {
-                collectionChangedEventArgs = e;
-                collectionChangedEventsCount++;
-            };
-            ((INotifyPropertyChanged)readOnlyGroup).PropertyChanged += (s, e) => isCountPropertyChangedEventRaised = isCountPropertyChangedEventRaised || e.PropertyName == nameof(readOnlyGroup.Count);
-
-            source.Clear();
-
-            readOnlyGroup.Should().BeEmpty();
-            readOnlyGroup.Count.Should().Be(0);
-
-            isCountPropertyChangedEventRaised.Should().BeTrue();
-            collectionChangedEventArgs.Should().NotBeNull();
-            collectionChangedEventsCount.Should().Be(1);
-            IsResetEventValid(collectionChangedEventArgs).Should().BeTrue();
-        }
-
-        [TestCategory("Collections")]
-        [TestMethod]
-        public void ReplaceGroupInSource_ShoudReplaceGroup()
-        {
-            NotifyCollectionChangedEventArgs collectionChangedEventArgs = null;
-            var collectionChangedEventsCount = 0;
-            var isCountPropertyChangedEventRaised = false;
-            var aItemsList = new[] { 1, 2, 3 };
-            var bItemsList = new[] { 2, 4, 6 };
-            var cItemsList = new[] { 7, 8, 9 };
-            var groups = new List<IGrouping<string, int>>
-            {
-                new IntGroup("A", aItemsList),
-                new IntGroup("B", bItemsList),
-            };
-            var source = new ObservableGroupedCollection<string, int>(groups);
-            var readOnlyGroup = new ReadOnlyObservableGroupedCollection<string, int>(source);
-            ((INotifyCollectionChanged)readOnlyGroup).CollectionChanged += (s, e) =>
-            {
-                collectionChangedEventArgs = e;
-                collectionChangedEventsCount++;
-            };
-            ((INotifyPropertyChanged)readOnlyGroup).PropertyChanged += (s, e) => isCountPropertyChangedEventRaised = isCountPropertyChangedEventRaised || e.PropertyName == nameof(readOnlyGroup.Count);
-
-            source[0] = new ObservableGroup<string, int>("C", cItemsList);
-
-            readOnlyGroup.Should().HaveCount(2);
-            readOnlyGroup.Count.Should().Be(2);
-            readOnlyGroup.ElementAt(0).Key.Should().Be("C");
-            readOnlyGroup.ElementAt(0).Should().BeEquivalentTo(cItemsList, o => o.WithoutStrictOrdering());
-            readOnlyGroup.ElementAt(1).Key.Should().Be("B");
-            readOnlyGroup.ElementAt(1).Should().BeEquivalentTo(bItemsList, o => o.WithoutStrictOrdering());
-
-            isCountPropertyChangedEventRaised.Should().BeFalse();
-            collectionChangedEventArgs.Should().NotBeNull();
-            collectionChangedEventsCount.Should().Be(1);
-            IsReplaceEventValid(collectionChangedEventArgs, aItemsList, cItemsList).Should().BeTrue();
-        }
-
-        private static bool IsAddEventValid(NotifyCollectionChangedEventArgs args, IEnumerable<int> expectedGroupItems, int addIndex)
-        {
-            var newItems = args.NewItems?.Cast<IEnumerable<int>>();
-            return args.Action == NotifyCollectionChangedAction.Add &&
-                    args.NewStartingIndex == addIndex &&
-                    args.OldItems == null &&
-                    newItems?.Count() == 1 &&
-                    Enumerable.SequenceEqual(newItems.ElementAt(0), expectedGroupItems);
-        }
-
-        private static bool IsRemoveEventValid(NotifyCollectionChangedEventArgs args, IEnumerable<int> expectedGroupItems, int oldIndex)
-        {
-            var oldItems = args.OldItems?.Cast<IEnumerable<int>>();
-            return args.Action == NotifyCollectionChangedAction.Remove &&
-                    args.NewItems == null &&
-                    args.OldStartingIndex == oldIndex &&
-                    oldItems?.Count() == 1 &&
-                    Enumerable.SequenceEqual(oldItems.ElementAt(0), expectedGroupItems);
-        }
-
-        private static bool IsMoveEventValid(NotifyCollectionChangedEventArgs args, IEnumerable<int> expectedGroupItems, int oldIndex, int newIndex)
-        {
-            var oldItems = args.OldItems?.Cast<IEnumerable<int>>();
-            var newItems = args.NewItems?.Cast<IEnumerable<int>>();
-            return args.Action == NotifyCollectionChangedAction.Move &&
-                    args.OldStartingIndex == oldIndex &&
-                    args.NewStartingIndex == newIndex &&
-                    oldItems?.Count() == 1 &&
-                    Enumerable.SequenceEqual(oldItems.ElementAt(0), expectedGroupItems) &&
-                    newItems?.Count() == 1 &&
-                    Enumerable.SequenceEqual(newItems.ElementAt(0), expectedGroupItems);
-        }
-
-        private static bool IsReplaceEventValid(NotifyCollectionChangedEventArgs args, IEnumerable<int> expectedRemovedItems, IEnumerable<int> expectedAddItems)
-        {
-            var oldItems = args.OldItems?.Cast<IEnumerable<int>>();
-            var newItems = args.NewItems?.Cast<IEnumerable<int>>();
-            return args.Action == NotifyCollectionChangedAction.Replace &&
-                    oldItems?.Count() == 1 &&
-                    Enumerable.SequenceEqual(oldItems.ElementAt(0), expectedRemovedItems) &&
-                    newItems?.Count() == 1 &&
-                    Enumerable.SequenceEqual(newItems.ElementAt(0), expectedAddItems);
-        }
-
-        private static bool IsResetEventValid(NotifyCollectionChangedEventArgs args) => args.Action == NotifyCollectionChangedAction.Reset && args.NewItems == null && args.OldItems == null;
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Array.cs b/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Array.cs
deleted file mode 100644
index 8069f1f5053..00000000000
--- a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Array.cs
+++ /dev/null
@@ -1,182 +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.Diagnostics;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Diagnostics
-{
-    public partial class Test_Guard
-    {
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsEmpty_ArrayOk()
-        {
-            Guard.IsEmpty(new int[0], nameof(Test_Guard_IsEmpty_ArrayOk));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsEmpty_ArrayFail()
-        {
-            Guard.IsEmpty(new int[1], nameof(Test_Guard_IsEmpty_ArrayFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsNotEmpty_ArrayOk()
-        {
-            Guard.IsNotEmpty(new int[1], nameof(Test_Guard_IsNotEmpty_ArrayOk));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsNotEmpty_ArrayFail()
-        {
-            Guard.IsNotEmpty(new int[0], nameof(Test_Guard_IsNotEmpty_ArrayFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_HasSizeEqualTo_ArrayOk()
-        {
-            Guard.HasSizeEqualTo(new int[4], 4, nameof(Test_Guard_HasSizeEqualTo_ArrayOk));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_HasSizeEqualTo_ArrayFail()
-        {
-            Guard.HasSizeEqualTo(new int[3], 4, nameof(Test_Guard_HasSizeEqualTo_ArrayOk));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_HasSizeNotEqualTo_ArrayOk()
-        {
-            Guard.HasSizeNotEqualTo(new int[3], 4, nameof(Test_Guard_HasSizeNotEqualTo_ArrayOk));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_HasSizeNotEqualTo_ArrayFail()
-        {
-            Guard.HasSizeNotEqualTo(new int[4], 4, nameof(Test_Guard_HasSizeNotEqualTo_ArrayFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_HasSizeGreaterThan_ArrayOk()
-        {
-            Guard.HasSizeGreaterThan(new int[5], 2, nameof(Test_Guard_HasSizeGreaterThan_ArrayOk));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_HasSizeGreaterThan_ArrayEqualFail()
-        {
-            Guard.HasSizeGreaterThan(new int[4], 4, nameof(Test_Guard_HasSizeGreaterThan_ArrayEqualFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_HasSizeGreaterThan_ArraySmallerFail()
-        {
-            Guard.HasSizeGreaterThan(new int[1], 4, nameof(Test_Guard_HasSizeGreaterThan_ArraySmallerFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_HasSizeGreaterThanOrEqualTo_ArrayOk()
-        {
-            Guard.HasSizeGreaterThanOrEqualTo(new int[5], 2, nameof(Test_Guard_HasSizeGreaterThanOrEqualTo_ArrayOk));
-            Guard.HasSizeGreaterThanOrEqualTo(new int[2], 2, nameof(Test_Guard_HasSizeGreaterThanOrEqualTo_ArrayOk));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_HasSizeGreaterThanOrEqualTo_ArrayFail()
-        {
-            Guard.HasSizeGreaterThan(new int[1], 4, nameof(Test_Guard_HasSizeGreaterThanOrEqualTo_ArrayFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_HasSizeLessThan_ArrayOk()
-        {
-            Guard.HasSizeLessThan(new int[1], 5, nameof(Test_Guard_HasSizeLessThan_ArrayOk));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_HasSizeLessThan_ArrayEqualFail()
-        {
-            Guard.HasSizeLessThan(new int[4], 4, nameof(Test_Guard_HasSizeLessThan_ArrayEqualFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_HasSizeLessThan_ArrayGreaterFail()
-        {
-            Guard.HasSizeLessThan(new int[6], 4, nameof(Test_Guard_HasSizeLessThan_ArrayGreaterFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_HasSizeLessThanOrEqualTo_ArrayOk()
-        {
-            Guard.HasSizeLessThanOrEqualTo(new int[1], 5, nameof(Test_Guard_HasSizeLessThanOrEqualTo_ArrayOk));
-            Guard.HasSizeLessThanOrEqualTo(new int[5], 5, nameof(Test_Guard_HasSizeLessThanOrEqualTo_ArrayOk));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_HasSizeLessThanOrEqualTo_ArrayFail()
-        {
-            Guard.HasSizeLessThanOrEqualTo(new int[8], 4, nameof(Test_Guard_HasSizeLessThanOrEqualTo_ArrayFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_HasSizeEqualToArray_ArrayOk()
-        {
-            Guard.HasSizeEqualTo(new int[1], new int[1], nameof(Test_Guard_HasSizeEqualToArray_ArrayOk));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_HasSizeEqualToArray_ArrayFail()
-        {
-            Guard.HasSizeEqualTo(new int[8], new int[2], nameof(Test_Guard_HasSizeEqualToArray_ArrayFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_HasSizeLessThanOrEqualToArray_ArrayOk()
-        {
-            Guard.HasSizeLessThanOrEqualTo(new int[2], new int[5], nameof(Test_Guard_HasSizeLessThanOrEqualToArray_ArrayOk));
-            Guard.HasSizeLessThanOrEqualTo(new int[4], new int[4], nameof(Test_Guard_HasSizeLessThanOrEqualToArray_ArrayOk));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_HasSizeLessThanOrEqualToArray_ArrayFail()
-        {
-            Guard.HasSizeLessThanOrEqualTo(new int[8], new int[2], nameof(Test_Guard_HasSizeLessThanOrEqualToArray_ArrayFail));
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Comparable.Numeric.cs b/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Comparable.Numeric.cs
deleted file mode 100644
index 6453fa161be..00000000000
--- a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.Comparable.Numeric.cs
+++ /dev/null
@@ -1,113 +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.Diagnostics;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Diagnostics
-{
-    public partial class Test_Guard
-    {
-        [TestCategory("Guard")]
-        [TestMethod]
-        [DataRow(0, 20, 10u, false)]
-        [DataRow(0, 6, 5u, false)]
-        [DataRow(0, int.MaxValue, 500u, false)]
-        [DataRow(-500, -530, 10u, false)]
-        [DataRow(1000, 800, 100u, false)]
-        [DataRow(int.MaxValue, int.MaxValue - 10, 7u, false)]
-        [DataRow(int.MinValue, int.MaxValue, (uint)int.MaxValue, false)]
-        [DataRow(0, 5, 10u, true)]
-        [DataRow(0, 5, 5u, true)]
-        [DataRow(0, int.MaxValue, (uint)int.MaxValue, true)]
-        [DataRow(-500, -530, 50u, true)]
-        [DataRow(1000, 800, 200u, true)]
-        [DataRow(int.MaxValue, int.MaxValue - 10, 10u, true)]
-        public void Test_Guard_IsCloseOrNotToInt(int value, int target, uint delta, bool isClose)
-        {
-            void Test(int value, int target)
-            {
-                bool isFailed = false;
-
-                try
-                {
-                    Guard.IsCloseTo(value, target, delta, nameof(Test_Guard_IsCloseOrNotToInt));
-                }
-                catch (ArgumentException)
-                {
-                    isFailed = true;
-                }
-
-                Assert.AreEqual(isClose, !isFailed);
-
-                isFailed = false;
-
-                try
-                {
-                    Guard.IsNotCloseTo(value, target, delta, nameof(Test_Guard_IsCloseOrNotToInt));
-                }
-                catch (ArgumentException)
-                {
-                    isFailed = true;
-                }
-
-                Assert.AreEqual(isClose, isFailed);
-            }
-
-            Test(value, target);
-            Test(target, value);
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [DataRow(0f, 20f, 10f, false)]
-        [DataRow(0f, 6f, 5f, false)]
-        [DataRow(0f, float.MaxValue, 500f, false)]
-        [DataRow(-500f, -530f, 10f, false)]
-        [DataRow(1000f, 800f, 100f, false)]
-        [DataRow(float.MaxValue, float.MaxValue / 2, 7f, false)]
-        [DataRow(float.MinValue, float.MaxValue, float.MaxValue, false)]
-        [DataRow(0f, 5f, 10f, true)]
-        [DataRow(0f, 5f, 5f, true)]
-        [DataRow(0f, float.MaxValue, float.MaxValue, true)]
-        [DataRow(-500f, -530f, 50f, true)]
-        [DataRow(1000f, 800f, 200f, true)]
-        [DataRow(float.MaxValue, float.MaxValue - 10, 10f, true)]
-        public void Test_Guard_IsCloseToFloat(float value, float target, float delta, bool isClose)
-        {
-            void Test(float value, float target)
-            {
-                bool isFailed = false;
-
-                try
-                {
-                    Guard.IsCloseTo(value, target, delta, nameof(Test_Guard_IsCloseToFloat));
-                }
-                catch (ArgumentException)
-                {
-                    isFailed = true;
-                }
-
-                Assert.AreEqual(isClose, !isFailed);
-
-                isFailed = false;
-
-                try
-                {
-                    Guard.IsNotCloseTo(value, target, delta, nameof(Test_Guard_IsCloseToFloat));
-                }
-                catch (ArgumentException)
-                {
-                    isFailed = true;
-                }
-
-                Assert.AreEqual(isClose, isFailed);
-            }
-
-            Test(value, target);
-            Test(target, value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.cs b/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.cs
deleted file mode 100644
index 726d7096a76..00000000000
--- a/UnitTests/UnitTests.Shared/Diagnostics/Test_Guard.cs
+++ /dev/null
@@ -1,703 +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.Diagnostics;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Diagnostics
-{
-    [TestClass]
-    public partial class Test_Guard
-    {
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsNull_Ok()
-        {
-            Guard.IsNull<object>(null, nameof(Test_Guard_IsNull_Ok));
-            Guard.IsNull<int>(null, nameof(Test_Guard_IsNull_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsNull_ClassFail()
-        {
-            Guard.IsNull(new object(), nameof(Test_Guard_IsNull_ClassFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsNull_StructFail()
-        {
-            Guard.IsNull<int>(7, nameof(Test_Guard_IsNull_StructFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsNotNull_Ok()
-        {
-            Guard.IsNotNull(new object(), nameof(Test_Guard_IsNotNull_Ok));
-            Guard.IsNotNull<int>(7, nameof(Test_Guard_IsNotNull_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void Test_Guard_IsNotNull_ClassFail()
-        {
-            Guard.IsNotNull<object>(null, nameof(Test_Guard_IsNotNull_ClassFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void Test_Guard_IsNotNull_StructFail()
-        {
-            Guard.IsNotNull<int>(null, nameof(Test_Guard_IsNotNull_StructFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsOfT_Ok()
-        {
-            Guard.IsOfType<string>("Hello", nameof(Test_Guard_IsOfT_Ok));
-            Guard.IsOfType<int>(7, nameof(Test_Guard_IsOfT_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsOfT_Fail()
-        {
-            Guard.IsOfType<string>(7, nameof(Test_Guard_IsOfT_Fail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsOfType_Ok()
-        {
-            Guard.IsOfType("Hello", typeof(string), nameof(Test_Guard_IsOfType_Ok));
-            Guard.IsOfType(7, typeof(int), nameof(Test_Guard_IsOfType_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsOfType_Fail()
-        {
-            Guard.IsOfType(7, typeof(string), nameof(Test_Guard_IsOfType_Fail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsAssignableToT_Ok()
-        {
-            Guard.IsAssignableToType<string>("Hello", nameof(Test_Guard_IsAssignableToT_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsAssignableToT_Fail()
-        {
-            Guard.IsAssignableToType<string>(7, nameof(Test_Guard_IsAssignableToT_Fail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsAssignableToType_Ok()
-        {
-            Guard.IsAssignableToType("Hello", typeof(string), nameof(Test_Guard_IsAssignableToType_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsAssignableToType_Fail()
-        {
-            Guard.IsAssignableToType(7, typeof(string), nameof(Test_Guard_IsAssignableToType_Fail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsNullOrEmpty_Ok()
-        {
-            Guard.IsNullOrEmpty(null, nameof(Test_Guard_IsNullOrEmpty_Ok));
-            Guard.IsNullOrEmpty(string.Empty, nameof(Test_Guard_IsNullOrEmpty_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsNullOrEmpty_Fail()
-        {
-            Guard.IsNullOrEmpty("Hello", nameof(Test_Guard_IsNullOrEmpty_Fail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsNotNullOrEmpty_Ok()
-        {
-            Guard.IsNotNullOrEmpty("Hello", nameof(Test_Guard_IsNotNullOrEmpty_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void Test_Guard_IsNotNullOrEmpty_Null()
-        {
-            Guard.IsNotNullOrEmpty(null, nameof(Test_Guard_IsNotNullOrEmpty_Null));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsNotNullOrEmpty_Empty()
-        {
-            Guard.IsNotNullOrEmpty(string.Empty, nameof(Test_Guard_IsNotNullOrEmpty_Empty));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsNotNullOrWhiteSpace_Ok()
-        {
-            Guard.IsNotNullOrWhiteSpace("Hello", nameof(Test_Guard_IsNotNullOrWhiteSpace_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentNullException))]
-        public void Test_Guard_IsNotNullOrWhiteSpace_Null()
-        {
-            Guard.IsNotNullOrWhiteSpace(null, nameof(Test_Guard_IsNotNullOrWhiteSpace_Null));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsNotNullOrWhiteSpace_Empty()
-        {
-            Guard.IsNotNullOrWhiteSpace("  ", nameof(Test_Guard_IsNotNullOrWhiteSpace_Empty));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsEqualTo_Ok()
-        {
-            Guard.IsEqualTo("Hello", "Hello", nameof(Test_Guard_IsEqualTo_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsEqualTo_Fail()
-        {
-            Guard.IsEqualTo("Hello", "World", nameof(Test_Guard_IsEqualTo_Fail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsNotEqualTo_Ok()
-        {
-            Guard.IsNotEqualTo("Hello", "World", nameof(Test_Guard_IsNotEqualTo_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsNotEqualTo_Fail()
-        {
-            Guard.IsNotEqualTo("Hello", "Hello", nameof(Test_Guard_IsNotEqualTo_Fail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsBitwiseEqualTo_Ok()
-        {
-            Guard.IsBitwiseEqualTo(byte.MaxValue, byte.MaxValue, nameof(Test_Guard_IsBitwiseEqualTo_Ok));
-            Guard.IsBitwiseEqualTo(MathF.PI, MathF.PI, nameof(Test_Guard_IsBitwiseEqualTo_Ok));
-            Guard.IsBitwiseEqualTo(double.Epsilon, double.Epsilon, nameof(Test_Guard_IsBitwiseEqualTo_Ok));
-
-            var guid = Guid.NewGuid();
-            Guard.IsBitwiseEqualTo(guid, guid, nameof(Test_Guard_IsBitwiseEqualTo_Ok));
-
-            // tests the >16 byte case where the loop is called
-            var biggerThanLimit = new BiggerThanLimit(0, 3, ulong.MaxValue, ulong.MinValue);
-            Guard.IsBitwiseEqualTo(biggerThanLimit, biggerThanLimit, nameof(Test_Guard_IsBitwiseEqualTo_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsBitwiseEqualTo_Size8Fail()
-        {
-            Guard.IsBitwiseEqualTo(double.PositiveInfinity, double.Epsilon, nameof(Test_Guard_IsBitwiseEqualTo_Size8Fail));
-            Guard.IsBitwiseEqualTo(DateTime.Now, DateTime.Today, nameof(Test_Guard_IsBitwiseEqualTo_Size8Fail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsBitwiseEqualTo_Size16Fail()
-        {
-            Guard.IsBitwiseEqualTo(decimal.MaxValue, decimal.MinusOne, nameof(Test_Guard_IsBitwiseEqualTo_Size16Fail));
-            Guard.IsBitwiseEqualTo(Guid.NewGuid(), Guid.NewGuid(), nameof(Test_Guard_IsBitwiseEqualTo_Size16Fail));
-        }
-
-        // a >16 byte struct for testing IsBitwiseEqual's pathway for >16 byte types
-        private struct BiggerThanLimit
-        {
-            public BiggerThanLimit(ulong a, ulong b, ulong c, ulong d)
-            {
-                A = a;
-                B = b;
-                C = c;
-                D = d;
-            }
-
-            public ulong A;
-
-            public ulong B;
-
-            public ulong C;
-
-            public ulong D;
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsBitwiseEqualTo_SequenceEqualFail()
-        {
-            // tests the >16 byte case where the loop is called
-            var biggerThanLimit0 = new BiggerThanLimit(0, 3, ulong.MaxValue, ulong.MinValue);
-            var biggerThanLimit1 = new BiggerThanLimit(long.MaxValue + 1UL, 99, ulong.MaxValue ^ 0xF7UL, ulong.MinValue ^ 5555UL);
-
-            Guard.IsBitwiseEqualTo(biggerThanLimit0, biggerThanLimit1, nameof(Test_Guard_IsBitwiseEqualTo_SequenceEqualFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsReferenceEqualTo_Ok()
-        {
-            var obj = new object();
-
-            Guard.IsReferenceEqualTo(obj, obj, nameof(Test_Guard_IsReferenceEqualTo_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsReferenceEqualTo_Fail()
-        {
-            Guard.IsReferenceEqualTo(new object(), new object(), nameof(Test_Guard_IsReferenceEqualTo_Fail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsReferenceNotEqualTo_Ok()
-        {
-            Guard.IsReferenceNotEqualTo(new object(), new object(), nameof(Test_Guard_IsReferenceEqualTo_Fail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsReferenceNotEqualTo_Fail()
-        {
-            var obj = new object();
-
-            Guard.IsReferenceNotEqualTo(obj, obj, nameof(Test_Guard_IsReferenceEqualTo_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsTrue_Ok()
-        {
-            Guard.IsTrue(true, nameof(Test_Guard_IsTrue_Ok));
-            Guard.IsTrue(true, nameof(Test_Guard_IsTrue_Ok), "Hello world");
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsTrue_Fail()
-        {
-            Guard.IsTrue(false, nameof(Test_Guard_IsTrue_Fail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsTrue_Fail_WithMessage()
-        {
-            try
-            {
-                Guard.IsTrue(false, nameof(Test_Guard_IsTrue_Fail_WithMessage), "Hello world");
-            }
-            catch (ArgumentException e)
-            {
-                Assert.IsTrue(e.Message.Contains("\"Hello world\""));
-
-                return;
-            }
-
-            // Compiler detects this is unreachable from attribute,
-            // but we leave the assertion to double check that's valid
-            Assert.Fail();
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsFalse_Ok()
-        {
-            Guard.IsFalse(false, nameof(Test_Guard_IsFalse_Ok));
-            Guard.IsFalse(false, nameof(Test_Guard_IsFalse_Ok), "Hello world");
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentException))]
-        public void Test_Guard_IsFalse_Fail()
-        {
-            Guard.IsFalse(true, nameof(Test_Guard_IsFalse_Fail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsFalse_Fail_WithMessage()
-        {
-            try
-            {
-                Guard.IsFalse(true, nameof(Test_Guard_IsFalse_Fail_WithMessage), "Hello world");
-            }
-            catch (ArgumentException e)
-            {
-                Assert.IsTrue(e.Message.Contains("\"Hello world\""));
-
-                return;
-            }
-
-            Assert.Fail();
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsLessThan_Ok()
-        {
-            Guard.IsLessThan(1, 2, nameof(Test_Guard_IsLessThan_Ok));
-            Guard.IsLessThan(1.2f, 3.14f, nameof(Test_Guard_IsLessThan_Ok));
-            Guard.IsLessThan(DateTime.Now, DateTime.MaxValue, nameof(Test_Guard_IsLessThan_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsLessThan_EqualsFalse()
-        {
-            Guard.IsLessThan(1, 1, nameof(Test_Guard_IsLessThan_EqualsFalse));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsLessThan_GreaterFalse()
-        {
-            Guard.IsLessThan(2, 1, nameof(Test_Guard_IsLessThan_GreaterFalse));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsLessThanOrEqualTo_Ok()
-        {
-            Guard.IsLessThanOrEqualTo(1, 2, nameof(Test_Guard_IsLessThanOrEqualTo_Ok));
-            Guard.IsLessThanOrEqualTo(1, 1, nameof(Test_Guard_IsLessThanOrEqualTo_Ok));
-            Guard.IsLessThanOrEqualTo(0.1f, MathF.PI, nameof(Test_Guard_IsLessThanOrEqualTo_Ok));
-            Guard.IsLessThanOrEqualTo(MathF.PI, MathF.PI, nameof(Test_Guard_IsLessThanOrEqualTo_Ok));
-            Guard.IsLessThanOrEqualTo(DateTime.Today, DateTime.MaxValue, nameof(Test_Guard_IsLessThanOrEqualTo_Ok));
-            Guard.IsLessThanOrEqualTo(DateTime.MaxValue, DateTime.MaxValue, nameof(Test_Guard_IsLessThanOrEqualTo_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsLessThanOrEqualTo_False()
-        {
-            Guard.IsLessThanOrEqualTo(2, 1, nameof(Test_Guard_IsLessThanOrEqualTo_False));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsGreaterThan_Ok()
-        {
-            Guard.IsGreaterThan(2, 1, nameof(Test_Guard_IsGreaterThan_Ok));
-            Guard.IsGreaterThan(3.14f, 2.1f, nameof(Test_Guard_IsGreaterThan_Ok));
-            Guard.IsGreaterThan(DateTime.MaxValue, DateTime.Today, nameof(Test_Guard_IsGreaterThan_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsGreaterThan_EqualsFalse()
-        {
-            Guard.IsGreaterThan(1, 1, nameof(Test_Guard_IsGreaterThan_EqualsFalse));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsGreaterThan_LowerFalse()
-        {
-            Guard.IsGreaterThan(1, 2, nameof(Test_Guard_IsGreaterThan_LowerFalse));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsGreaterThanOrEqualTo_Ok()
-        {
-            Guard.IsGreaterThanOrEqualTo(2, 1, nameof(Test_Guard_IsGreaterThanOrEqualTo_Ok));
-            Guard.IsGreaterThanOrEqualTo(1, 1, nameof(Test_Guard_IsGreaterThanOrEqualTo_Ok));
-            Guard.IsGreaterThanOrEqualTo(MathF.PI, 1, nameof(Test_Guard_IsGreaterThanOrEqualTo_Ok));
-            Guard.IsGreaterThanOrEqualTo(MathF.PI, MathF.PI, nameof(Test_Guard_IsGreaterThanOrEqualTo_Ok));
-            Guard.IsGreaterThanOrEqualTo(DateTime.MaxValue, DateTime.Today, nameof(Test_Guard_IsGreaterThanOrEqualTo_Ok));
-            Guard.IsGreaterThanOrEqualTo(DateTime.MaxValue, DateTime.MaxValue, nameof(Test_Guard_IsGreaterThanOrEqualTo_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsGreaterThanOrEqualTo_False()
-        {
-            Guard.IsGreaterThanOrEqualTo(1, 2, nameof(Test_Guard_IsGreaterThanOrEqualTo_False));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsInRange_Ok()
-        {
-            Guard.IsInRange(1, 0, 4, nameof(Test_Guard_IsInRange_Ok));
-            Guard.IsInRange(0, 0, 2, nameof(Test_Guard_IsInRange_Ok));
-            Guard.IsInRange(3.14f, 0, 10, nameof(Test_Guard_IsInRange_Ok));
-            Guard.IsInRange(1, 0, 3.14f, nameof(Test_Guard_IsInRange_Ok));
-            Guard.IsInRange(1, -50, 2, nameof(Test_Guard_IsInRange_Ok));
-            Guard.IsInRange(-44, -44, 0, nameof(Test_Guard_IsInRange_Ok));
-            Guard.IsInRange(3.14f, -float.Epsilon, 22, nameof(Test_Guard_IsInRange_Ok));
-            Guard.IsInRange(1, int.MinValue, int.MaxValue, nameof(Test_Guard_IsInRange_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsInRange_LowerFail()
-        {
-            Guard.IsInRange(-3, 0, 4, nameof(Test_Guard_IsInRange_LowerFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsInRange_EqualFail()
-        {
-            Guard.IsInRange(0, 4, 4, nameof(Test_Guard_IsInRange_EqualFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsInRange_HigherFail()
-        {
-            Guard.IsInRange(0, 20, 4, nameof(Test_Guard_IsInRange_HigherFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsNotInRange_Ok()
-        {
-            Guard.IsNotInRange(0, 4, 10, nameof(Test_Guard_IsNotInRange_Ok));
-            Guard.IsNotInRange(-4, 0, 2, nameof(Test_Guard_IsNotInRange_Ok));
-            Guard.IsNotInRange(12f, 0, 10, nameof(Test_Guard_IsNotInRange_Ok));
-            Guard.IsNotInRange(-1, 0, 3.14f, nameof(Test_Guard_IsNotInRange_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsNotInRange_LowerEqualFail()
-        {
-            Guard.IsNotInRange(0, 0, 4, nameof(Test_Guard_IsNotInRange_LowerEqualFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsNotInRange_InnerFail()
-        {
-            Guard.IsNotInRange(2, 0, 4, nameof(Test_Guard_IsNotInRange_InnerFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsInRangeFor_Ok()
-        {
-            Span<int> span = stackalloc int[10];
-
-            Guard.IsInRangeFor(0, span, nameof(Test_Guard_IsInRangeFor_Ok));
-            Guard.IsInRangeFor(4, span, nameof(Test_Guard_IsInRangeFor_Ok));
-            Guard.IsInRangeFor(9, span, nameof(Test_Guard_IsInRangeFor_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsInRangeFor_LowerFail()
-        {
-            Span<int> span = stackalloc int[10];
-
-            Guard.IsInRangeFor(-2, span, nameof(Test_Guard_IsInRangeFor_LowerFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsInRangeFor_EqualFail()
-        {
-            Span<int> span = stackalloc int[10];
-
-            Guard.IsInRangeFor(10, span, nameof(Test_Guard_IsInRangeFor_EqualFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsInRangeFor_HigherFail()
-        {
-            Span<int> span = stackalloc int[10];
-
-            Guard.IsInRangeFor(99, span, nameof(Test_Guard_IsInRangeFor_HigherFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsNotInRangeFor_Ok()
-        {
-            Span<int> span = stackalloc int[10];
-
-            Guard.IsNotInRangeFor(-2, span, nameof(Test_Guard_IsNotInRangeFor_Ok));
-            Guard.IsNotInRangeFor(10, span, nameof(Test_Guard_IsNotInRangeFor_Ok));
-            Guard.IsNotInRangeFor(2222, span, nameof(Test_Guard_IsNotInRangeFor_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsNotInRangeFor_LowerFail()
-        {
-            Span<int> span = stackalloc int[10];
-
-            Guard.IsNotInRangeFor(0, span, nameof(Test_Guard_IsNotInRangeFor_LowerFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsNotInRangeFor_MiddleFail()
-        {
-            Span<int> span = stackalloc int[10];
-
-            Guard.IsNotInRangeFor(6, span, nameof(Test_Guard_IsNotInRangeFor_MiddleFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsBetween_Ok()
-        {
-            Guard.IsBetween(1, 0, 4, nameof(Test_Guard_IsBetween_Ok));
-            Guard.IsBetween(3.14f, 0, 10, nameof(Test_Guard_IsBetween_Ok));
-            Guard.IsBetween(1, 0, 3.14, nameof(Test_Guard_IsBetween_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsBetween_LowerFail()
-        {
-            Guard.IsBetween(-1, 0, 4, nameof(Test_Guard_IsBetween_LowerFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsBetween_EqualFail()
-        {
-            Guard.IsBetween(0, 0, 4, nameof(Test_Guard_IsBetween_EqualFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsBetween_HigherFail()
-        {
-            Guard.IsBetween(6, 0, 4, nameof(Test_Guard_IsBetween_HigherFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsNotBetween_Ok()
-        {
-            Guard.IsNotBetween(0, 0, 4, nameof(Test_Guard_IsNotBetween_Ok));
-            Guard.IsNotBetween(10, 0, 10, nameof(Test_Guard_IsNotBetween_Ok));
-            Guard.IsNotBetween(-5, 0, 3.14, nameof(Test_Guard_IsNotBetween_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsNotBetween_Fail()
-        {
-            Guard.IsNotBetween(1, 0, 4, nameof(Test_Guard_IsNotBetween_Fail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsBetweenOrEqualTo_Ok()
-        {
-            Guard.IsBetweenOrEqualTo(1, 0, 4, nameof(Test_Guard_IsBetweenOrEqualTo_Ok));
-            Guard.IsBetweenOrEqualTo(10, 0, 10, nameof(Test_Guard_IsBetweenOrEqualTo_Ok));
-            Guard.IsBetweenOrEqualTo(1, 0, 3.14, nameof(Test_Guard_IsBetweenOrEqualTo_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsBetweenOrEqualTo_LowerFail()
-        {
-            Guard.IsBetweenOrEqualTo(-1, 0, 4, nameof(Test_Guard_IsBetweenOrEqualTo_LowerFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsBetweenOrEqualTo_HigherFail()
-        {
-            Guard.IsBetweenOrEqualTo(6, 0, 4, nameof(Test_Guard_IsBetweenOrEqualTo_HigherFail));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        public void Test_Guard_IsNotBetweenOrEqualTo_Ok()
-        {
-            Guard.IsNotBetweenOrEqualTo(6, 0, 4, nameof(Test_Guard_IsNotBetweenOrEqualTo_Ok));
-            Guard.IsNotBetweenOrEqualTo(-10, 0, 10, nameof(Test_Guard_IsNotBetweenOrEqualTo_Ok));
-        }
-
-        [TestCategory("Guard")]
-        [TestMethod]
-        [ExpectedException(typeof(ArgumentOutOfRangeException))]
-        public void Test_Guard_IsNotBetweenOrEqualTo_Fail()
-        {
-            Guard.IsNotBetweenOrEqualTo(3, 0, 4, nameof(Test_Guard_IsNotBetweenOrEqualTo_Fail));
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs b/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs
deleted file mode 100644
index 6c22789d92f..00000000000
--- a/UnitTests/UnitTests.Shared/Diagnostics/Test_ThrowHelper.cs
+++ /dev/null
@@ -1,145 +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.ComponentModel;
-using System.IO;
-using System.Linq;
-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(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_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 the throw method
-                try
-                {
-                    method.Invoke(null, parameters);
-                }
-                catch (TargetInvocationException e)
-                {
-                    Assert.IsInstanceOfType(e.InnerException, exceptionType);
-                }
-            }
-        }
-
-        [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);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_ArrayExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_ArrayExtensions.cs
deleted file mode 100644
index 00fc494c06b..00000000000
--- a/UnitTests/UnitTests.Shared/Extensions/Test_ArrayExtensions.cs
+++ /dev/null
@@ -1,90 +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;
-using System.Linq;
-using Microsoft.Toolkit;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Extensions
-{
-    [TestClass]
-    public class Test_ArrayExtensions
-    {
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_Jagged_GetColumn()
-        {
-            int[][] array =
-            {
-                new int[] { 5, 2, 4 },
-                new int[] { 6, 3 },
-                new int[] { 7 }
-            };
-
-            var col = array.GetColumn(1).ToArray();
-
-            CollectionAssert.AreEquivalent(new int[] { 2, 3, 0 }, col);
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_Jagged_GetColumn_Exception()
-        {
-            int[][] array =
-            {
-                new int[] { 5, 2, 4 },
-                new int[] { 6, 3 },
-                new int[] { 7 }
-            };
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
-            {
-                array.GetColumn(-1).ToArray();
-            });
-
-            Assert.ThrowsException<ArgumentOutOfRangeException>(() =>
-            {
-                array.GetColumn(3).ToArray();
-            });
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_Rectangular_ToString()
-        {
-            int[,] array =
-            {
-                { 5, 2,  4 },
-                { 6, 3, -1 },
-                { 7, 0,  9 }
-            };
-
-            string value = array.ToArrayString();
-
-            Debug.WriteLine(value);
-
-            Assert.AreEqual("[[5,\t2,\t4]," + Environment.NewLine + " [6,\t3,\t-1]," + Environment.NewLine + " [7,\t0,\t9]]", value);
-        }
-
-        [TestCategory("ArrayExtensions")]
-        [TestMethod]
-        public void Test_ArrayExtensions_Jagged_ToString()
-        {
-            int[][] array =
-            {
-                new int[] { 5, 2 },
-                new int[] { 6, 3, -1, 2 },
-                new int[] { 7, 0,  9 }
-            };
-
-            string value = array.ToArrayString();
-
-            Debug.WriteLine(value);
-
-            Assert.AreEqual("[[5,\t2]," + Environment.NewLine + " [6,\t3,\t-1,\t2]," + Environment.NewLine + " [7,\t0,\t9]]", value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_EventHandlerExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_EventHandlerExtensions.cs
deleted file mode 100644
index ed1f5e679db..00000000000
--- a/UnitTests/UnitTests.Shared/Extensions/Test_EventHandlerExtensions.cs
+++ /dev/null
@@ -1,138 +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.Tasks;
-using Microsoft.Toolkit.Deferred;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Extensions
-{
-    [TestClass]
-    public class Test_EventHandlerExtensions
-    {
-        [TestCategory("Deferred")]
-        [TestMethod]
-        public void Test_EventHandlerExtensions_GettingDeferralCausesAwait()
-        {
-            var tsc = new TaskCompletionSource<bool>();
-
-            var testClass = new TestClass();
-
-            testClass.TestEvent += async (s, e) =>
-            {
-                var deferral = e.GetDeferral();
-
-                await tsc.Task;
-
-                deferral.Complete();
-            };
-
-            var handlersTask = testClass.RaiseTestEvent();
-
-            Assert.IsFalse(handlersTask.IsCompleted);
-
-            tsc.SetResult(true);
-
-            Assert.IsTrue(handlersTask.IsCompleted);
-        }
-
-        [TestCategory("Deferred")]
-        [TestMethod]
-        public void Test_EventHandlerExtensions_NotGettingDeferralCausesNoAwait()
-        {
-            var tsc = new TaskCompletionSource<bool>();
-
-            var testClass = new TestClass();
-
-            testClass.TestEvent += async (s, e) =>
-            {
-                await tsc.Task;
-            };
-
-            var handlersTask = testClass.RaiseTestEvent();
-
-            Assert.IsTrue(handlersTask.IsCompleted);
-
-            tsc.SetResult(true);
-        }
-
-        [TestCategory("Deferred")]
-        [TestMethod]
-        public void Test_EventHandlerExtensions_UsingDeferralCausesAwait()
-        {
-            var tsc = new TaskCompletionSource<bool>();
-
-            var testClass = new TestClass();
-
-            testClass.TestEvent += async (s, e) =>
-            {
-                using (e.GetDeferral())
-                {
-                    await tsc.Task;
-                }
-            };
-
-            var handlersTask = testClass.RaiseTestEvent();
-
-            Assert.IsFalse(handlersTask.IsCompleted);
-
-            tsc.SetResult(true);
-
-            Assert.IsTrue(handlersTask.IsCompleted);
-        }
-
-        [TestCategory("Deferred")]
-        [DataTestMethod]
-        [DataRow(0, 1)]
-        [DataRow(1, 0)]
-        public void Test_EventHandlerExtensions_MultipleHandlersCauseAwait(int firstToReleaseDeferral, int lastToReleaseDeferral)
-        {
-            var tsc = new[]
-            {
-                new TaskCompletionSource<bool>(),
-                new TaskCompletionSource<bool>()
-            };
-
-            var testClass = new TestClass();
-
-            testClass.TestEvent += async (s, e) =>
-            {
-                var deferral = e.GetDeferral();
-
-                await tsc[0].Task;
-
-                deferral.Complete();
-            };
-
-            testClass.TestEvent += async (s, e) =>
-            {
-                var deferral = e.GetDeferral();
-
-                await tsc[1].Task;
-
-                deferral.Complete();
-            };
-
-            var handlersTask = testClass.RaiseTestEvent();
-
-            Assert.IsFalse(handlersTask.IsCompleted);
-
-            tsc[firstToReleaseDeferral].SetResult(true);
-
-            Assert.IsFalse(handlersTask.IsCompleted);
-
-            tsc[lastToReleaseDeferral].SetResult(true);
-
-            Assert.IsTrue(handlersTask.IsCompleted);
-        }
-
-        private class TestClass
-        {
-            public event EventHandler<DeferredEventArgs> TestEvent;
-
-            public Task RaiseTestEvent() => TestEvent.InvokeAsync(this, new DeferredEventArgs());
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs
deleted file mode 100644
index 3a9994e8195..00000000000
--- a/UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs
+++ /dev/null
@@ -1,127 +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.Tasks;
-using Microsoft.Toolkit;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Extensions
-{
-    [TestClass]
-    public class Test_TaskExtensions
-    {
-        [TestCategory("TaskExtensions")]
-        [TestMethod]
-        public void Test_TaskExtensions_ResultOrDefault()
-        {
-            TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
-
-            Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
-
-            tcs.SetCanceled();
-
-            Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
-
-            tcs = new TaskCompletionSource<int>();
-
-            tcs.SetException(new InvalidOperationException("Test"));
-
-            Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
-
-            tcs = new TaskCompletionSource<int>();
-
-            tcs.SetResult(42);
-
-            Assert.AreEqual(42, ((Task)tcs.Task).GetResultOrDefault());
-        }
-
-        [TestCategory("TaskExtensions")]
-        [TestMethod]
-        public void Test_TaskExtensions_ResultOrDefault_FromTaskCompleted()
-        {
-            Assert.AreEqual(null, Task.CompletedTask.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()
-        {
-            TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
-
-            Assert.AreEqual(0, tcs.Task.GetResultOrDefault());
-
-            tcs.SetCanceled();
-
-            Assert.AreEqual(0, tcs.Task.GetResultOrDefault());
-
-            tcs = new TaskCompletionSource<int>();
-
-            tcs.SetException(new InvalidOperationException("Test"));
-
-            Assert.AreEqual(0, tcs.Task.GetResultOrDefault());
-
-            tcs = new TaskCompletionSource<int>();
-
-            tcs.SetResult(42);
-
-            Assert.AreEqual(42, tcs.Task.GetResultOrDefault());
-        }
-
-        [TestCategory("TaskExtensions")]
-        [TestMethod]
-        public void Test_TaskExtensions_ResultOrDefault_OfT_String()
-        {
-            TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();
-
-            Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
-
-            tcs.SetCanceled();
-
-            Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
-
-            tcs = new TaskCompletionSource<string>();
-
-            tcs.SetException(new InvalidOperationException("Test"));
-
-            Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
-
-            tcs = new TaskCompletionSource<string>();
-
-            tcs.SetResult("Hello world");
-
-            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;
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
deleted file mode 100644
index 294028f6194..00000000000
--- a/UnitTests/UnitTests.Shared/Extensions/Test_TypeExtensions.cs
+++ /dev/null
@@ -1,161 +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 Microsoft.Toolkit.Diagnostics;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Extensions
-{
-    [TestClass]
-    public class Test_TypeExtensions
-    {
-        [TestCategory("TypeExtensions")]
-        [TestMethod]
-        [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))]
-        [DataRow("void", typeof(void))]
-        public void Test_TypeExtensions_BuiltInTypes(string name, Type type)
-        {
-            Assert.AreEqual(name, type.ToTypeString());
-        }
-
-        [TestCategory("TypeExtensions")]
-        [TestMethod]
-        [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(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.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.Llama<float, System.DateTime[]>>", typeof(List<Animal.Llama<float, DateTime[]>>))]
-        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
-            {
-            }
-
-            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 Llama<T1, T2>
-            {
-                public class Foo
-                {
-                }
-
-                public class Foo<T3>
-                {
-                }
-            }
-        }
-
-        private class Vehicle<T>
-        {
-        }
-    }
-
-    internal struct Foo<T>
-    {
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Extensions/Test_ValueTypeExtensions.cs b/UnitTests/UnitTests.Shared/Extensions/Test_ValueTypeExtensions.cs
deleted file mode 100644
index ae3bee35e16..00000000000
--- a/UnitTests/UnitTests.Shared/Extensions/Test_ValueTypeExtensions.cs
+++ /dev/null
@@ -1,26 +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.Diagnostics;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Extensions
-{
-    [TestClass]
-    public class Test_ValueTypeExtensions
-    {
-        [TestCategory("ValueTypeExtensions")]
-        [TestMethod]
-        public void Test_ValueTypeExtensions_ToHexString()
-        {
-            Assert.AreEqual(((byte)0).ToHexString(), "0x00");
-            Assert.AreEqual(((byte)127).ToHexString(), "0x7F");
-            Assert.AreEqual(((byte)255).ToHexString(), "0xFF");
-            Assert.AreEqual(((ushort)6458).ToHexString(), "0x193A");
-            Assert.AreEqual(6458.ToHexString(), "0x0000193A");
-            Assert.AreEqual((-1).ToHexString(), "0xFFFFFFFF");
-            Assert.AreEqual(true.ToHexString(), "0x01");
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs
deleted file mode 100644
index 7f89a2d306b..00000000000
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand.cs
+++ /dev/null
@@ -1,183 +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.ComponentModel;
-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()));
-
-            Assert.IsFalse(command.CanBeCanceled);
-            Assert.IsFalse(command.IsCancellationRequested);
-
-            (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()));
-
-            Assert.IsFalse(command.CanBeCanceled);
-            Assert.IsFalse(command.IsCancellationRequested);
-
-            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()));
-
-            Assert.IsFalse(command.CanBeCanceled);
-            Assert.IsFalse(command.IsCancellationRequested);
-
-            command.Execute(null);
-
-            Assert.AreEqual(ticks, 0);
-
-            command.Execute(new object());
-
-            Assert.AreEqual(ticks, 0);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public async Task Test_AsyncRelayCommand_WithCancellation()
-        {
-            TaskCompletionSource<object> tcs = new TaskCompletionSource<object>();
-
-            // We need to test the cancellation support here, so we use the overload with an input
-            // parameter, which is a cancellation token. The token is the one that is internally managed
-            // by the AsyncRelayCommand instance, and canceled when using IAsyncRelayCommand.Cancel().
-            var command = new AsyncRelayCommand(token => tcs.Task);
-
-            List<PropertyChangedEventArgs> args = new List<PropertyChangedEventArgs>();
-
-            command.PropertyChanged += (s, e) => args.Add(e);
-
-            // We have no canExecute parameter, so the command can always be invoked
-            Assert.IsTrue(command.CanExecute(null));
-            Assert.IsTrue(command.CanExecute(new object()));
-
-            // The command isn't running, so it can't be canceled yet
-            Assert.IsFalse(command.CanBeCanceled);
-            Assert.IsFalse(command.IsCancellationRequested);
-
-            // Start the command, which will return the token from our task completion source.
-            // We can use that to easily keep the command running while we do our tests, and then
-            // stop the processing by completing the source when we need (see below).
-            command.Execute(null);
-
-            // The command is running, so it can be canceled, as we used the token overload
-            Assert.IsTrue(command.CanBeCanceled);
-            Assert.IsFalse(command.IsCancellationRequested);
-
-            // Validate the various event args for all the properties that were updated when executing the command
-            Assert.AreEqual(args.Count, 4);
-            Assert.AreEqual(args[0].PropertyName, nameof(IAsyncRelayCommand.IsCancellationRequested));
-            Assert.AreEqual(args[1].PropertyName, nameof(IAsyncRelayCommand.ExecutionTask));
-            Assert.AreEqual(args[2].PropertyName, nameof(IAsyncRelayCommand.IsRunning));
-            Assert.AreEqual(args[3].PropertyName, nameof(IAsyncRelayCommand.CanBeCanceled));
-
-            command.Cancel();
-
-            // Verify that these two properties raised notifications correctly when canceling the command too.
-            // We need to ensure all command properties support notifications so that users can bind to them.
-            Assert.AreEqual(args.Count, 6);
-            Assert.AreEqual(args[4].PropertyName, nameof(IAsyncRelayCommand.IsCancellationRequested));
-            Assert.AreEqual(args[5].PropertyName, nameof(IAsyncRelayCommand.CanBeCanceled));
-
-            Assert.IsTrue(command.IsCancellationRequested);
-
-            // Complete the source, which will mark the command as completed too (as it returned the same task)
-            tcs.SetResult(null);
-
-            await command.ExecutionTask!;
-
-            // Verify that the command can no longer be canceled, and that the cancellation is
-            // instead still true, as that's reset when executing a command and not on completion.
-            Assert.IsFalse(command.CanBeCanceled);
-            Assert.IsTrue(command.IsCancellationRequested);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand{T}.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand{T}.cs
deleted file mode 100644
index 1ffc5a6f0ea..00000000000
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_AsyncRelayCommand{T}.cs
+++ /dev/null
@@ -1,142 +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.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;
-            });
-
-            Assert.IsFalse(command.CanExecute(null));
-            Assert.ThrowsException<NullReferenceException>(() => command.Execute(null));
-
-            command = new AsyncRelayCommand<int>(
-                i =>
-            {
-                n = i;
-                return Task.CompletedTask;
-            }, i => i > 0);
-
-            Assert.IsFalse(command.CanExecute(null));
-            Assert.ThrowsException<NullReferenceException>(() => command.Execute(null));
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
deleted file mode 100644
index 7df7a69215a..00000000000
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.Request.cs
+++ /dev/null
@@ -1,373 +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.Linq;
-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]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_RequestMessage_Ok(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-            object test = null;
-
-            void Receive(object recipient, NumberRequestMessage m)
-            {
-                test = recipient;
-
-                Assert.IsFalse(m.HasReceivedResponse);
-
-                m.Reply(42);
-
-                Assert.IsTrue(m.HasReceivedResponse);
-            }
-
-            messenger.Register<NumberRequestMessage>(recipient, Receive);
-
-            int result = messenger.Send<NumberRequestMessage>();
-
-            Assert.AreSame(test, recipient);
-            Assert.AreEqual(result, 42);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        [ExpectedException(typeof(InvalidOperationException))]
-        public void Test_Messenger_RequestMessage_Fail_NoReply(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-
-            int result = messenger.Send<NumberRequestMessage>();
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        [ExpectedException(typeof(InvalidOperationException))]
-        public void Test_Messenger_RequestMessage_Fail_MultipleReplies(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            void Receive(object recipient, NumberRequestMessage m)
-            {
-                m.Reply(42);
-                m.Reply(42);
-            }
-
-            messenger.Register<NumberRequestMessage>(recipient, Receive);
-
-            int result = messenger.Send<NumberRequestMessage>();
-
-            GC.KeepAlive(recipient);
-        }
-
-        public class NumberRequestMessage : RequestMessage<int>
-        {
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public async Task Test_Messenger_AsyncRequestMessage_Ok_Sync(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            void Receive(object recipient, 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);
-
-            GC.KeepAlive(recipient);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public async Task Test_Messenger_AsyncRequestMessage_Ok_Async(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            async Task<int> GetNumberAsync()
-            {
-                await Task.Delay(100);
-
-                return 42;
-            }
-
-            void Receive(object recipient, 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);
-
-            GC.KeepAlive(recipient);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        [ExpectedException(typeof(InvalidOperationException))]
-        public async Task Test_Messenger_AsyncRequestMessage_Fail_NoReply(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-
-            int result = await messenger.Send<AsyncNumberRequestMessage>();
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        [ExpectedException(typeof(InvalidOperationException))]
-        public async Task Test_Messenger_AsyncRequestMessage_Fail_MultipleReplies(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            void Receive(object recipient, AsyncNumberRequestMessage m)
-            {
-                m.Reply(42);
-                m.Reply(42);
-            }
-
-            messenger.Register<AsyncNumberRequestMessage>(recipient, Receive);
-
-            int result = await messenger.Send<AsyncNumberRequestMessage>();
-
-            GC.KeepAlive(recipient);
-        }
-
-        public class AsyncNumberRequestMessage : AsyncRequestMessage<int>
-        {
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_CollectionRequestMessage_Ok_NoReplies(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            void Receive(object recipient, NumbersCollectionRequestMessage m)
-            {
-            }
-
-            messenger.Register<NumbersCollectionRequestMessage>(recipient, Receive);
-
-            var results = messenger.Send<NumbersCollectionRequestMessage>().Responses;
-
-            Assert.AreEqual(results.Count, 0);
-
-            GC.KeepAlive(recipient);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_CollectionRequestMessage_Ok_MultipleReplies(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            object
-                recipient1 = new object(),
-                recipient2 = new object(),
-                recipient3 = new object(),
-                r1 = null,
-                r2 = null,
-                r3 = null;
-
-            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);
-            messenger.Register<NumbersCollectionRequestMessage>(recipient3, Receive3);
-
-            List<int> responses = new List<int>();
-
-            foreach (var response in messenger.Send<NumbersCollectionRequestMessage>())
-            {
-                responses.Add(response);
-            }
-
-            Assert.AreSame(r1, recipient1);
-            Assert.AreSame(r2, recipient2);
-            Assert.AreSame(r3, recipient3);
-
-            CollectionAssert.AreEquivalent(responses, new[] { 1, 2, 3 });
-        }
-
-        public class NumbersCollectionRequestMessage : CollectionRequestMessage<int>
-        {
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_NoReplies(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            void Receive(object recipient, AsyncNumbersCollectionRequestMessage m)
-            {
-            }
-
-            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient, Receive);
-
-            var results = await messenger.Send<AsyncNumbersCollectionRequestMessage>().GetResponsesAsync();
-
-            Assert.AreEqual(results.Count, 0);
-
-            GC.KeepAlive(recipient);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_MultipleReplies(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            object
-                recipient1 = new object(),
-                recipient2 = new object(),
-                recipient3 = new object(),
-                recipient4 = new object();
-
-            async Task<int> GetNumberAsync()
-            {
-                await Task.Delay(100);
-
-                return 3;
-            }
-
-            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);
-            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient3, Receive3);
-            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient4, Receive4);
-
-            var responses = await messenger.Send<AsyncNumbersCollectionRequestMessage>().GetResponsesAsync();
-
-            CollectionAssert.AreEquivalent(responses.ToArray(), new[] { 1, 2, 3, 3 });
-
-            GC.KeepAlive(recipient1);
-            GC.KeepAlive(recipient2);
-            GC.KeepAlive(recipient3);
-            GC.KeepAlive(recipient4);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public async Task Test_Messenger_AsyncCollectionRequestMessage_Ok_MultipleReplies_Enumerate(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            object
-                recipient1 = new object(),
-                recipient2 = new object(),
-                recipient3 = new object(),
-                recipient4 = new object();
-
-            async Task<int> GetNumberAsync()
-            {
-                await Task.Delay(100);
-
-                return 3;
-            }
-
-            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);
-            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient3, Receive3);
-            messenger.Register<AsyncNumbersCollectionRequestMessage>(recipient4, Receive4);
-
-            List<int> responses = new List<int>();
-
-            await foreach (var response in messenger.Send<AsyncNumbersCollectionRequestMessage>())
-            {
-                responses.Add(response);
-            }
-
-            CollectionAssert.AreEquivalent(responses, new[] { 1, 2, 3, 3 });
-
-            GC.KeepAlive(recipient1);
-            GC.KeepAlive(recipient2);
-            GC.KeepAlive(recipient3);
-            GC.KeepAlive(recipient4);
-        }
-
-        public class AsyncNumbersCollectionRequestMessage : AsyncCollectionRequestMessage<int>
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
deleted file mode 100644
index 85adc99af92..00000000000
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_Messenger.cs
+++ /dev/null
@@ -1,631 +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.CodeAnalysis;
-using System.Linq;
-using System.Reflection;
-using Microsoft.Toolkit.Mvvm.Messaging;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Mvvm
-{
-    [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1601", Justification = "Type only used for testing")]
-    [TestClass]
-    public partial class Test_Messenger
-    {
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_UnregisterRecipientWithMessageType(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            messenger.Unregister<MessageA>(recipient);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_UnregisterRecipientWithMessageTypeAndToken(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            messenger.Unregister<MessageA, string>(recipient, nameof(MessageA));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_UnregisterRecipientWithToken(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            messenger.UnregisterAll(recipient, nameof(MessageA));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_UnregisterRecipientWithRecipient(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            messenger.UnregisterAll(recipient);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageType(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            messenger.Register<MessageA>(recipient, (r, m) => { });
-
-            messenger.Unregister<MessageA>(recipient);
-
-            Assert.IsFalse(messenger.IsRegistered<MessageA>(recipient));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_RegisterAndUnregisterRecipientWithMessageTypeAndToken(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
-
-            messenger.Unregister<MessageA, string>(recipient, nameof(MessageA));
-
-            Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_RegisterAndUnregisterRecipientWithToken(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
-
-            messenger.UnregisterAll(recipient, nameof(MessageA));
-
-            Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_RegisterAndUnregisterRecipientWithRecipient(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
-
-            messenger.UnregisterAll(recipient);
-
-            Assert.IsFalse(messenger.IsRegistered<MessageA, string>(recipient, nameof(MessageA)));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithNoToken(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            object a = new object();
-
-            Assert.IsFalse(messenger.IsRegistered<MessageA>(a));
-
-            object recipient = null;
-            string result = null;
-
-            messenger.Register<MessageA>(a, (r, m) =>
-            {
-                recipient = r;
-                result = m.Text;
-            });
-
-            Assert.IsTrue(messenger.IsRegistered<MessageA>(a));
-
-            messenger.Send(new MessageA { Text = nameof(MessageA) });
-
-            Assert.AreSame(recipient, a);
-            Assert.AreEqual(result, nameof(MessageA));
-
-            messenger.Unregister<MessageA>(a);
-
-            Assert.IsFalse(messenger.IsRegistered<MessageA>(a));
-
-            recipient = null;
-            result = null;
-
-            messenger.Send(new MessageA { Text = nameof(MessageA) });
-
-            Assert.IsNull(recipient);
-            Assert.IsNull(result);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_IsRegistered_Register_Send_UnregisterRecipient_WithNoToken(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            object a = new object();
-
-            Assert.IsFalse(messenger.IsRegistered<MessageA>(a));
-
-            string result = null;
-            messenger.Register<MessageA>(a, (r, m) => result = m.Text);
-
-            Assert.IsTrue(messenger.IsRegistered<MessageA>(a));
-
-            messenger.Send(new MessageA { Text = nameof(MessageA) });
-
-            Assert.AreEqual(result, nameof(MessageA));
-
-            messenger.UnregisterAll(a);
-
-            Assert.IsFalse(messenger.IsRegistered<MessageA>(a));
-
-            result = null;
-            messenger.Send(new MessageA { Text = nameof(MessageA) });
-
-            Assert.IsNull(result);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_IsRegistered_Register_Send_UnregisterOfTMessage_WithToken(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            object a = new object();
-
-            Assert.IsFalse(messenger.IsRegistered<MessageA>(a));
-
-            string result = null;
-            messenger.Register<MessageA, string>(a, nameof(MessageA), (r, 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);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_DuplicateRegistrationWithMessageType(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            messenger.Register<MessageA>(recipient, (r, m) => { });
-
-            Assert.ThrowsException<InvalidOperationException>(() =>
-            {
-                messenger.Register<MessageA>(recipient, (r, m) => { });
-            });
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_DuplicateRegistrationWithMessageTypeAndToken(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new object();
-
-            messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
-
-            Assert.ThrowsException<InvalidOperationException>(() =>
-            {
-                messenger.Register<MessageA, string>(recipient, nameof(MessageA), (r, m) => { });
-            });
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_IRecipient_NoMessages(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new RecipientWithNoMessages();
-
-            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
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_IRecipient_SomeMessages_NoToken(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));
-
-            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);
-            Assert.AreEqual(recipient.Bs, 1);
-
-            messenger.UnregisterAll(recipient);
-
-            Assert.IsFalse(messenger.IsRegistered<MessageA>(recipient));
-            Assert.IsFalse(messenger.IsRegistered<MessageB>(recipient));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_IRecipient_SomeMessages_WithToken(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var recipient = new RecipientWithSomeMessages();
-            var token = nameof(Test_Messenger_IRecipient_SomeMessages_WithToken);
-
-            messenger.RegisterAll(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));
-
-            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);
-
-            messenger.UnregisterAll(recipient, token);
-
-            Assert.IsFalse(messenger.IsRegistered<MessageA>(recipient));
-            Assert.IsFalse(messenger.IsRegistered<MessageB>(recipient));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_RegisterWithTypeParameter(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            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);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger), false)]
-        [DataRow(typeof(WeakReferenceMessenger), 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);
-
-            GC.KeepAlive(messenger);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        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(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        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(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        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]
-        public void Test_Messenger_AutoCleanup()
-        {
-            IMessenger messenger = new WeakReferenceMessenger();
-
-            static int GetRecipientsMapCount(IMessenger messenger)
-            {
-                object recipientsMap =
-                    typeof(WeakReferenceMessenger)
-                    .GetField("recipientsMap", BindingFlags.Instance | BindingFlags.NonPublic)
-                    .GetValue(messenger);
-
-                return (int)recipientsMap.GetType().GetProperty("Count").GetValue(recipientsMap);
-            }
-
-            WeakReference weakRecipient;
-
-            void Test()
-            {
-                var recipient = new RecipientWithSomeMessages();
-                weakRecipient = new WeakReference(recipient);
-
-                messenger.Register<MessageA>(recipient);
-
-                Assert.IsTrue(messenger.IsRegistered<MessageA>(recipient));
-
-                Assert.AreEqual(GetRecipientsMapCount(messenger), 1);
-
-                GC.KeepAlive(recipient);
-            }
-
-            Test();
-
-            GC.Collect();
-
-            Assert.IsFalse(weakRecipient.IsAlive);
-
-            // Now that the recipient is collected, trigger another full GC collection
-            // to let the automatic cleanup callback run and trim the messenger data
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
-
-            Assert.AreEqual(GetRecipientsMapCount(messenger), 0);
-
-            GC.KeepAlive(messenger);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        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();
-        }
-
-        // See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4081
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_Messenger_RegisterMultiple_UnregisterSingle(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-
-            var recipient1 = new object();
-            var recipient2 = new object();
-
-            int handler1CalledCount = 0;
-            int handler2CalledCount = 0;
-
-            messenger.Register<object, MessageA>(recipient1, (r, m) => { handler1CalledCount++; });
-            messenger.Register<object, MessageA>(recipient2, (r, m) => { handler2CalledCount++; });
-
-            messenger.UnregisterAll(recipient2);
-
-            messenger.Send(new MessageA());
-
-            Assert.AreEqual(1, handler1CalledCount);
-            Assert.AreEqual(0, handler2CalledCount);
-        }
-
-        public sealed class RecipientWithNoMessages
-        {
-            public int Number { get; set; }
-        }
-
-        public sealed class RecipientWithSomeMessages :
-            IRecipient<MessageA>,
-            IRecipient<MessageB>,
-            ICloneable
-        {
-            public int As { get; private set; }
-
-            public void Receive(MessageA message)
-            {
-                As++;
-            }
-
-            public int Bs { get; private set; }
-
-            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
-        {
-            public string Text { get; set; }
-        }
-
-        public sealed class MessageB
-        {
-        }
-    }
-}
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
deleted file mode 100644
index 13856e69707..00000000000
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableObject.cs
+++ /dev/null
@@ -1,233 +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;
-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.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);
-            };
-
-            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 => SetProperty(ref data, value);
-            }
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableObject_ProxyCrudWithProperty()
-        {
-            var model = new WrappingModelWithProperty(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(WrappingModelWithProperty.Name));
-            Assert.AreEqual(changing.Item2, "Alice");
-            Assert.AreEqual(changed.Item1?.PropertyName, nameof(WrappingModelWithProperty.Name));
-            Assert.AreEqual(changed.Item2, "Bob");
-            Assert.AreEqual(model.PersonProxy.Name, "Bob");
-        }
-
-        public class Person
-        {
-            public string Name { get; set; }
-        }
-
-        public class WrappingModelWithProperty : ObservableObject
-        {
-            private Person Person { get; }
-
-            public WrappingModelWithProperty(Person person)
-            {
-                Person = person;
-            }
-
-            public Person PersonProxy => Person;
-
-            public string Name
-            {
-                get => Person.Name;
-                set => SetProperty(Person.Name, value, Person, (person, name) => person.Name = name);
-            }
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableObject_ProxyCrudWithField()
-        {
-            var model = new WrappingModelWithField(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.PersonProxy.Name, "Bob");
-        }
-
-        public class WrappingModelWithField : ObservableObject
-        {
-            private readonly Person person;
-
-            public WrappingModelWithField(Person person)
-            {
-                this.person = person;
-            }
-
-            public Person PersonProxy => this.person;
-
-            public string Name
-            {
-                get => this.person.Name;
-                set => SetProperty(this.person.Name, value, this.person, (person, name) => person.Name = name);
-            }
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public async Task Test_ObservableObject_NotifyTask()
-        {
-            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;
-
-                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;
-
-                callback(tcs);
-
-                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);
-            }
-
-            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
-        {
-            private TaskNotifier<T> data;
-
-            public Task<T> Data
-            {
-                get => data;
-                set => SetPropertyAndNotifyOnCompletion(ref data, value);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
deleted file mode 100644
index 95112e8d707..00000000000
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableRecipient.cs
+++ /dev/null
@@ -1,135 +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.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.Messaging;
-using Microsoft.Toolkit.Mvvm.Messaging.Messages;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Mvvm
-{
-    [TestClass]
-    public class Test_ObservableRecipient
-    {
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_ObservableRecipient_Activation(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var viewmodel = new SomeRecipient<int>(messenger);
-
-            Assert.IsFalse(viewmodel.IsActivatedCheck);
-
-            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")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        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>();
-
-            Assert.AreSame(viewmodel.CurrentMessenger, WeakReferenceMessenger.Default);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_ObservableRecipient_Injection(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var viewmodel = new SomeRecipient<int>(messenger);
-
-            Assert.AreSame(viewmodel.CurrentMessenger, messenger);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(StrongReferenceMessenger))]
-        [DataRow(typeof(WeakReferenceMessenger))]
-        public void Test_ObservableRecipient_Broadcast(Type type)
-        {
-            var messenger = (IMessenger)Activator.CreateInstance(type);
-            var viewmodel = new SomeRecipient<int>(messenger);
-
-            PropertyChangedMessage<int> message = null;
-
-            messenger.Register<PropertyChangedMessage<int>>(messenger, (r, 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(SomeRecipient<int>.Data));
-        }
-
-        public class SomeRecipient<T> : ObservableRecipient
-        {
-            public SomeRecipient()
-            {
-            }
-
-            public SomeRecipient(IMessenger messenger)
-                : base(messenger)
-            {
-            }
-
-            public IMessenger CurrentMessenger => Messenger;
-
-            private T data;
-
-            public T Data
-            {
-                get => data;
-                set => SetProperty(ref data, value, true);
-            }
-
-            public bool IsActivatedCheck { get; private set; }
-
-            protected override void OnActivated()
-            {
-                IsActivatedCheck = true;
-
-                Messenger.Register<SampleMessage>(this, (r, m) => { });
-            }
-
-            protected override void OnDeactivated()
-            {
-                base.OnDeactivated();
-
-                IsActivatedCheck = false;
-            }
-        }
-
-        public class SampleMessage
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
deleted file mode 100644
index ae3cd35d652..00000000000
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_ObservableValidator.cs
+++ /dev/null
@@ -1,729 +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.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Reflection;
-using System.Text.RegularExpressions;
-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();
-            var args = new List<PropertyChangedEventArgs>();
-
-            model.PropertyChanged += (s, e) => args.Add(e);
-
-            Assert.IsFalse(model.HasErrors);
-
-            model.Name = "No";
-
-            // Verify that errors were correctly reported as changed, and that all the relevant
-            // properties were broadcast as well (both the changed property and HasErrors). We need
-            // this last one to raise notifications too so that users can bind to that in the UI.
-            Assert.IsTrue(model.HasErrors);
-            Assert.AreEqual(args.Count, 2);
-            Assert.AreEqual(args[0].PropertyName, nameof(Person.Name));
-            Assert.AreEqual(args[1].PropertyName, nameof(INotifyDataErrorInfo.HasErrors));
-
-            model.Name = "Valid";
-
-            Assert.IsFalse(model.HasErrors);
-            Assert.AreEqual(args.Count, 4);
-            Assert.AreEqual(args[2].PropertyName, nameof(Person.Name));
-            Assert.AreEqual(args[3].PropertyName, nameof(INotifyDataErrorInfo.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).Count(), 0);
-            Assert.AreEqual(model.GetErrors(string.Empty).Count(), 0);
-            Assert.AreEqual(model.GetErrors("ThereIsntAPropertyWithThisName").Count(), 0);
-            Assert.AreEqual(model.GetErrors(nameof(Person.Name)).Count(), 0);
-
-            model.Name = "Foo";
-
-            var errors = model.GetErrors(nameof(Person.Name)).ToArray();
-
-            Assert.AreEqual(errors.Length, 1);
-            Assert.AreEqual(errors[0].MemberNames.First(), nameof(Person.Name));
-
-            Assert.AreEqual(model.GetErrors("ThereIsntAPropertyWithThisName").Count(), 0);
-
-            errors = model.GetErrors(null).ToArray();
-
-            Assert.AreEqual(errors.Length, 1);
-            Assert.AreEqual(errors[0].MemberNames.First(), nameof(Person.Name));
-
-            errors = model.GetErrors(string.Empty).ToArray();
-
-            Assert.AreEqual(errors.Length, 1);
-            Assert.AreEqual(errors[0].MemberNames.First(), nameof(Person.Name));
-
-            model.Age = -1;
-
-            errors = model.GetErrors(null).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).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))));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [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 { Name = value };
-
-            Assert.AreEqual(model.HasErrors, !isValid);
-
-            if (isValid)
-            {
-                Assert.IsTrue(!model.GetErrors(nameof(Person.Name)).Any());
-            }
-            else
-            {
-                Assert.IsTrue(model.GetErrors(nameof(Person.Name)).Any());
-            }
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableValidator_TrySetProperty()
-        {
-            var model = new Person();
-            var events = new List<DataErrorsChangedEventArgs>();
-
-            model.ErrorsChanged += (s, e) => events.Add(e);
-
-            // Set a correct value, this should update the property
-            Assert.IsTrue(model.TrySetName("Hello", out var errors));
-            Assert.IsTrue(errors.Count == 0);
-            Assert.IsTrue(events.Count == 0);
-            Assert.AreEqual(model.Name, "Hello");
-            Assert.IsFalse(model.HasErrors);
-
-            // Invalid value #1, this should be ignored
-            Assert.IsFalse(model.TrySetName(null, out errors));
-            Assert.IsTrue(errors.Count > 0);
-            Assert.IsTrue(events.Count == 0);
-            Assert.AreEqual(model.Name, "Hello");
-            Assert.IsFalse(model.HasErrors);
-
-            // Invalid value #2, same as above
-            Assert.IsFalse(model.TrySetName("This string is too long for the target property in this model and should fail", out errors));
-            Assert.IsTrue(errors.Count > 0);
-            Assert.IsTrue(events.Count == 0);
-            Assert.AreEqual(model.Name, "Hello");
-            Assert.IsFalse(model.HasErrors);
-
-            // Correct value, this should update the property
-            Assert.IsTrue(model.TrySetName("Hello world", out errors));
-            Assert.IsTrue(errors.Count == 0);
-            Assert.IsTrue(events.Count == 0);
-            Assert.AreEqual(model.Name, "Hello world");
-            Assert.IsFalse(model.HasErrors);
-
-            // Actually set an invalid value to show some errors
-            model.Name = "No";
-
-            // Errors should now be present
-            Assert.IsTrue(model.HasErrors);
-            Assert.IsTrue(events.Count == 1);
-            Assert.IsTrue(model.GetErrors(nameof(Person.Name)).Any());
-            Assert.IsTrue(model.HasErrors);
-
-            // Trying to set a correct property should clear the errors
-            Assert.IsTrue(model.TrySetName("This is fine", out errors));
-            Assert.IsTrue(errors.Count == 0);
-            Assert.IsTrue(events.Count == 2);
-            Assert.IsFalse(model.HasErrors);
-            Assert.AreEqual(model.Name, "This is fine");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableValidator_ValidateProperty()
-        {
-            var model = new ComparableModel();
-            var events = new List<DataErrorsChangedEventArgs>();
-
-            model.ErrorsChanged += (s, e) => events.Add(e);
-
-            // Set a correct value for both properties, first A then B
-            model.A = 42;
-            model.B = 30;
-
-            Assert.AreEqual(events.Count, 0);
-            Assert.IsFalse(model.HasErrors);
-
-            // Make B greater than A, hence invalidating A
-            model.B = 50;
-
-            Assert.AreEqual(events.Count, 1);
-            Assert.AreEqual(events.Last().PropertyName, nameof(ComparableModel.A));
-            Assert.IsTrue(model.HasErrors);
-
-            events.Clear();
-
-            // Make A greater than B, hence making it valid again
-            model.A = 51;
-
-            Assert.AreEqual(events.Count, 1);
-            Assert.AreEqual(events.Last().PropertyName, nameof(ComparableModel.A));
-            Assert.AreEqual(model.GetErrors(nameof(ComparableModel.A)).Count(), 0);
-            Assert.IsFalse(model.HasErrors);
-
-            events.Clear();
-
-            // Make A smaller than B, hence invalidating it
-            model.A = 49;
-
-            Assert.AreEqual(events.Count, 1);
-            Assert.AreEqual(events.Last().PropertyName, nameof(ComparableModel.A));
-            Assert.AreEqual(model.GetErrors(nameof(ComparableModel.A)).Count(), 1);
-            Assert.IsTrue(model.HasErrors);
-
-            events.Clear();
-
-            // Lower B, hence making A valid again
-            model.B = 20;
-
-            Assert.AreEqual(events.Count, 1);
-            Assert.AreEqual(events.Last().PropertyName, nameof(ComparableModel.A));
-            Assert.AreEqual(model.GetErrors(nameof(ComparableModel.A)).Count(), 0);
-            Assert.IsFalse(model.HasErrors);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableValidator_ClearErrors()
-        {
-            var model = new Person();
-            var events = new List<DataErrorsChangedEventArgs>();
-
-            model.ErrorsChanged += (s, e) => events.Add(e);
-
-            model.Age = -2;
-
-            Assert.IsTrue(model.HasErrors);
-            Assert.IsTrue(model.GetErrors(nameof(Person.Age)).Any());
-
-            model.ClearErrors(nameof(Person.Age));
-
-            Assert.IsFalse(model.HasErrors);
-            Assert.IsTrue(events.Count == 2);
-
-            model.Age = 200;
-            model.Name = "Bo";
-            events.Clear();
-
-            Assert.IsTrue(model.HasErrors);
-            Assert.IsTrue(model.GetErrors(nameof(Person.Age)).Any());
-            Assert.IsTrue(model.GetErrors(nameof(Person.Name)).Any());
-
-            model.ClearErrors(null);
-            Assert.IsFalse(model.HasErrors);
-            Assert.IsFalse(model.GetErrors(nameof(Person.Age)).Any());
-            Assert.IsFalse(model.GetErrors(nameof(Person.Name)).Any());
-            Assert.IsTrue(events.Count == 2);
-            Assert.IsTrue(events[0].PropertyName == nameof(Person.Age));
-            Assert.IsTrue(events[1].PropertyName == nameof(Person.Name));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableValidator_ValidateAllProperties()
-        {
-            var model = new PersonWithDeferredValidation();
-            var events = new List<DataErrorsChangedEventArgs>();
-
-            model.ErrorsChanged += (s, e) => events.Add(e);
-
-            model.ValidateAllProperties();
-
-            Assert.IsTrue(model.HasErrors);
-            Assert.IsTrue(events.Count == 2);
-
-            // Note: we can't use an index here because the order used to return properties
-            // from reflection APIs is an implementation detail and might change at any time.
-            Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Name)));
-            Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Age)));
-
-            events.Clear();
-
-            model.Name = "James";
-            model.Age = 42;
-
-            model.ValidateAllProperties();
-
-            Assert.IsFalse(model.HasErrors);
-            Assert.IsTrue(events.Count == 2);
-            Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Name)));
-            Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Age)));
-
-            events.Clear();
-
-            model.Age = -10;
-
-            model.ValidateAllProperties();
-
-            Assert.IsTrue(model.HasErrors);
-            Assert.IsTrue(events.Count == 1);
-            Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Age)));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableValidator_ValidateAllProperties_WithFallback()
-        {
-            var model = new PersonWithDeferredValidation();
-            var events = new List<DataErrorsChangedEventArgs>();
-
-            MethodInfo[] staticMethods = typeof(ObservableValidator).GetMethods(BindingFlags.Static | BindingFlags.NonPublic);
-            MethodInfo validationMethod = staticMethods.Single(static m => m.Name.Contains("GetValidationActionFallback"));
-            Func<Type, Action<object>> validationFunc = (Func<Type, Action<object>>)validationMethod.CreateDelegate(typeof(Func<Type, Action<object>>));
-            Action<object> validationAction = validationFunc(model.GetType());
-
-            model.ErrorsChanged += (s, e) => events.Add(e);
-
-            validationAction(model);
-
-            Assert.IsTrue(model.HasErrors);
-            Assert.IsTrue(events.Count == 2);
-
-            // Note: we can't use an index here because the order used to return properties
-            // from reflection APIs is an implementation detail and might change at any time.
-            Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Name)));
-            Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Age)));
-
-            events.Clear();
-
-            model.Name = "James";
-            model.Age = 42;
-
-            validationAction(model);
-
-            Assert.IsFalse(model.HasErrors);
-            Assert.IsTrue(events.Count == 2);
-            Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Name)));
-            Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Age)));
-
-            events.Clear();
-
-            model.Age = -10;
-
-            validationAction(model);
-
-            Assert.IsTrue(model.HasErrors);
-            Assert.IsTrue(events.Count == 1);
-            Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Age)));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableValidator_CustomValidation()
-        {
-            var items = new Dictionary<object, object> { [nameof(CustomValidationModel.A)] = 42 };
-            var model = new CustomValidationModel(items);
-            var events = new List<DataErrorsChangedEventArgs>();
-
-            model.ErrorsChanged += (s, e) => events.Add(e);
-
-            model.A = 10;
-
-            Assert.IsFalse(model.HasErrors);
-            Assert.AreEqual(events.Count, 0);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableValidator_CustomValidationWithInjectedService()
-        {
-            var model = new ValidationWithServiceModel(new FancyService());
-            var events = new List<DataErrorsChangedEventArgs>();
-
-            model.ErrorsChanged += (s, e) => events.Add(e);
-
-            model.Name = "This is a valid name";
-
-            Assert.IsFalse(model.HasErrors);
-            Assert.AreEqual(events.Count, 0);
-
-            model.Name = "This is invalid238!!";
-
-            Assert.IsTrue(model.HasErrors);
-            Assert.AreEqual(events.Count, 1);
-            Assert.AreEqual(events[0].PropertyName, nameof(ValidationWithServiceModel.Name));
-            Assert.AreEqual(model.GetErrors(nameof(ValidationWithServiceModel.Name)).ToArray().Length, 1);
-
-            model.Name = "This is valid but it is too long so the validation will fail anyway";
-
-            Assert.IsTrue(model.HasErrors);
-            Assert.AreEqual(events.Count, 2);
-            Assert.AreEqual(events[1].PropertyName, nameof(ValidationWithServiceModel.Name));
-            Assert.AreEqual(model.GetErrors(nameof(ValidationWithServiceModel.Name)).ToArray().Length, 1);
-
-            model.Name = "This is both too long and it also contains invalid characters, a real disaster!";
-
-            Assert.IsTrue(model.HasErrors);
-            Assert.AreEqual(events.Count, 3);
-            Assert.AreEqual(events[2].PropertyName, nameof(ValidationWithServiceModel.Name));
-            Assert.AreEqual(model.GetErrors(nameof(ValidationWithServiceModel.Name)).ToArray().Length, 2);
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_ObservableValidator_ValidationWithFormattedDisplayName()
-        {
-            var model = new ValidationWithDisplayName();
-
-            Assert.IsTrue(model.HasErrors);
-
-            // We need to order because there is no guaranteed order on the members of a type
-            ValidationResult[] allErrors = model.GetErrors().OrderBy(error => error.ErrorMessage).ToArray();
-
-            Assert.AreEqual(allErrors.Length, 2);
-
-            Assert.AreEqual(allErrors[0].MemberNames.Count(), 1);
-            Assert.AreEqual(allErrors[0].MemberNames.Single(), nameof(ValidationWithDisplayName.StringMayNotBeEmpty));
-            Assert.AreEqual(allErrors[0].ErrorMessage, $"FIRST: {nameof(ValidationWithDisplayName.StringMayNotBeEmpty)}.");
-
-            Assert.AreEqual(allErrors[1].MemberNames.Count(), 1);
-            Assert.AreEqual(allErrors[1].MemberNames.Single(), nameof(ValidationWithDisplayName.AnotherRequiredField));
-            Assert.AreEqual(allErrors[1].ErrorMessage, $"SECOND: {nameof(ValidationWithDisplayName.AnotherRequiredField)}.");
-        }
-
-        // See: https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4272
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(MyBase))]
-        [DataRow(typeof(MyDerived2))]
-        public void Test_ObservableRecipient_ValidationOnNonValidatableProperties(Type type)
-        {
-            MyBase viewmodel = (MyBase)Activator.CreateInstance(type);
-
-            viewmodel.ValidateAll();
-        }
-
-        // See: https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4272
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        [DataRow(typeof(MyBase))]
-        [DataRow(typeof(MyDerived2))]
-        public void Test_ObservableRecipient_ValidationOnNonValidatableProperties_WithFallback(Type type)
-        {
-            MyBase viewmodel = (MyBase)Activator.CreateInstance(type);
-
-            MethodInfo[] staticMethods = typeof(ObservableValidator).GetMethods(BindingFlags.Static | BindingFlags.NonPublic);
-            MethodInfo validationMethod = staticMethods.Single(static m => m.Name.Contains("GetValidationActionFallback"));
-            Func<Type, Action<object>> validationFunc = (Func<Type, Action<object>>)validationMethod.CreateDelegate(typeof(Func<Type, Action<object>>));
-
-            validationFunc(viewmodel.GetType())(viewmodel);
-        }
-
-        public class Person : ObservableValidator
-        {
-            private string name;
-
-            [MinLength(4)]
-            [MaxLength(20)]
-            [Required]
-            public string Name
-            {
-                get => this.name;
-                set => SetProperty(ref this.name, value, true);
-            }
-
-            public bool TrySetName(string value, out IReadOnlyCollection<ValidationResult> errors)
-            {
-                return TrySetProperty(ref name, value, out errors, nameof(Name));
-            }
-
-            private int age;
-
-            [Range(0, 100)]
-            public int Age
-            {
-                get => this.age;
-                set => SetProperty(ref this.age, value, true);
-            }
-
-            public new void ClearErrors(string propertyName)
-            {
-                base.ClearErrors(propertyName);
-            }
-        }
-
-        public class PersonWithDeferredValidation : ObservableValidator
-        {
-            [MinLength(4)]
-            [MaxLength(20)]
-            [Required]
-            public string Name { get; set; }
-
-            [Range(18, 100)]
-            public int Age { get; set; }
-
-            // Extra property with no validation
-            public float Foo { get; set; } = float.NaN;
-
-            public new void ValidateAllProperties()
-            {
-                base.ValidateAllProperties();
-            }
-        }
-
-        /// <summary>
-        /// Test model for linked properties, to test <see cref="ObservableValidator.ValidateProperty(object?, string?)"/> instance.
-        /// See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/3665 for the original request for this feature.
-        /// </summary>
-        public class ComparableModel : ObservableValidator
-        {
-            private int a;
-
-            [Range(10, 100)]
-            [GreaterThan(nameof(B))]
-            public int A
-            {
-                get => this.a;
-                set => SetProperty(ref this.a, value, true);
-            }
-
-            private int b;
-
-            [Range(20, 80)]
-            public int B
-            {
-                get => this.b;
-                set
-                {
-                    SetProperty(ref this.b, value, true);
-                    ValidateProperty(A, nameof(A));
-                }
-            }
-        }
-
-        public sealed class GreaterThanAttribute : ValidationAttribute
-        {
-            public GreaterThanAttribute(string propertyName)
-            {
-                PropertyName = propertyName;
-            }
-
-            public string PropertyName { get; }
-
-            protected override ValidationResult IsValid(object value, ValidationContext validationContext)
-            {
-                object
-                    instance = validationContext.ObjectInstance,
-                    otherValue = instance.GetType().GetProperty(PropertyName).GetValue(instance);
-
-                if (((IComparable)value).CompareTo(otherValue) > 0)
-                {
-                    return ValidationResult.Success;
-                }
-
-                return new ValidationResult("The current value is smaller than the other one");
-            }
-        }
-
-        /// <summary>
-        /// Test model for custom validation properties.
-        /// See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/3729 for the original request for this feature.
-        /// </summary>
-        public class CustomValidationModel : ObservableValidator
-        {
-            public CustomValidationModel(IDictionary<object, object> items)
-                : base(items)
-            {
-            }
-
-            private int a;
-
-            [CustomValidation(typeof(CustomValidationModel), nameof(ValidateA))]
-            public int A
-            {
-                get => this.a;
-                set => SetProperty(ref this.a, value, true);
-            }
-
-            public static ValidationResult ValidateA(int x, ValidationContext context)
-            {
-                Assert.AreEqual(context.MemberName, nameof(A));
-
-                if ((int)context.Items[nameof(A)] == 42)
-                {
-                    return ValidationResult.Success;
-                }
-
-                return new ValidationResult("Missing the magic number");
-            }
-        }
-
-        public interface IFancyService
-        {
-            bool Validate(string name);
-        }
-
-        public class FancyService : IFancyService
-        {
-            public bool Validate(string name)
-            {
-                return Regex.IsMatch(name, @"^[A-Za-z ]+$");
-            }
-        }
-
-        /// <summary>
-        /// Test model for custom validation with an injected service.
-        /// See https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/3750 for the original request for this feature.
-        /// </summary>
-        public class ValidationWithServiceModel : ObservableValidator
-        {
-            private readonly IFancyService service;
-
-            public ValidationWithServiceModel(IFancyService service)
-            {
-                this.service = service;
-            }
-
-            private string name;
-
-            [MaxLength(25, ErrorMessage = "The name is too long")]
-            [CustomValidation(typeof(ValidationWithServiceModel), nameof(ValidateName))]
-            public string Name
-            {
-                get => this.name;
-                set => SetProperty(ref this.name, value, true);
-            }
-
-            public static ValidationResult ValidateName(string name, ValidationContext context)
-            {
-                bool isValid = ((ValidationWithServiceModel)context.ObjectInstance).service.Validate(name);
-
-                if (isValid)
-                {
-                    return ValidationResult.Success;
-                }
-
-                return new ValidationResult("The name contains invalid characters");
-            }
-        }
-
-        /// <summary>
-        /// Test model for validation with a formatted display name string on each property.
-        /// This is issue #1 from https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/3763.
-        /// </summary>
-        public class ValidationWithDisplayName : ObservableValidator
-        {
-            public ValidationWithDisplayName()
-            {
-                ValidateAllProperties();
-            }
-
-            private string stringMayNotBeEmpty;
-
-            [Required(AllowEmptyStrings = false, ErrorMessage = "FIRST: {0}.")]
-            public string StringMayNotBeEmpty
-            {
-                get => this.stringMayNotBeEmpty;
-                set => SetProperty(ref this.stringMayNotBeEmpty, value, true);
-            }
-
-            private string anotherRequiredField;
-
-            [Required(AllowEmptyStrings = false, ErrorMessage = "SECOND: {0}.")]
-            public string AnotherRequiredField
-            {
-                get => this.anotherRequiredField;
-                set => SetProperty(ref this.anotherRequiredField, value, true);
-            }
-        }
-
-        public class MyBase : ObservableValidator
-        {
-            public int? MyDummyInt { get; set; } = 0;
-
-            public void ValidateAll()
-            {
-                ValidateAllProperties();
-            }
-        }
-
-        public class MyDerived2 : MyBase
-        {
-            public string Name { get; set; }
-
-            public int SomeRandomproperty { get; set; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand.cs
deleted file mode 100644
index f7e52bcb69e..00000000000
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand.cs
+++ /dev/null
@@ -1,83 +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.Mvvm.Input;
-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.NotifyCanExecuteChanged();
-
-            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);
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand{T}.cs b/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand{T}.cs
deleted file mode 100644
index c8c7ab3476e..00000000000
--- a/UnitTests/UnitTests.Shared/Mvvm/Test_RelayCommand{T}.cs
+++ /dev/null
@@ -1,86 +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.CodeAnalysis;
-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_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.NotifyCanExecuteChanged();
-
-            Assert.AreSame(args.Item1, command);
-            Assert.AreSame(args.Item2, EventArgs.Empty);
-
-            command.Execute((object)"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((object)"Hello");
-
-            Assert.AreEqual(text, "Hello");
-
-            command.Execute(null);
-
-            Assert.AreEqual(text, "Hello");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void Test_RelayCommand_NullWithValueType()
-        {
-            int n = 0;
-
-            var command = new RelayCommand<int>(i => n = i);
-
-            Assert.IsFalse(command.CanExecute(null));
-            Assert.ThrowsException<NullReferenceException>(() => command.Execute(null));
-
-            command = new RelayCommand<int>(i => n = i, i => i > 0);
-
-            Assert.IsFalse(command.CanExecute(null));
-            Assert.ThrowsException<NullReferenceException>(() => command.Execute(null));
-        }
-    }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems b/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
deleted file mode 100644
index 74a4c92f12a..00000000000
--- a/UnitTests/UnitTests.Shared/UnitTests.Shared.projitems
+++ /dev/null
@@ -1,36 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>4e9466d1-d5aa-46ac-801b-c8fdab79f0d4</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>UnitTests.Shared</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Collections\IntGroup.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Collections\ObservableGroupedCollectionExtensionsTests.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Collections\ObservableGroupedCollectionTests.cs" />
-    <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" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\Test_EventHandlerExtensions.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" />
-    <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_AsyncRelayCommand{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_RelayCommand.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_RelayCommand{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Mvvm\Test_ObservableRecipient.cs" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Shared/UnitTests.Shared.shproj b/UnitTests/UnitTests.Shared/UnitTests.Shared.shproj
deleted file mode 100644
index ac39578b12e..00000000000
--- a/UnitTests/UnitTests.Shared/UnitTests.Shared.shproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>4e9466d1-d5aa-46ac-801b-c8fdab79f0d4</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="UnitTests.Shared.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/UnitTests/UnitTests.SourceGenerators/Test_SourceGeneratorsDiagnostics.cs b/UnitTests/UnitTests.SourceGenerators/Test_SourceGeneratorsDiagnostics.cs
deleted file mode 100644
index 42359ba7774..00000000000
--- a/UnitTests/UnitTests.SourceGenerators/Test_SourceGeneratorsDiagnostics.cs
+++ /dev/null
@@ -1,426 +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.Collections.Immutable;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.SourceGenerators;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTests.Mvvm
-{
-    [TestClass]
-    public class Test_SourceGeneratorsDiagnostics
-    {
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void DuplicateINotifyPropertyChangedInterfaceForINotifyPropertyChangedAttributeError_Explicit()
-        {
-            string source = @"
-            using System.ComponentModel;
-            using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-            namespace MyApp
-            {
-                [INotifyPropertyChanged]
-                public partial class SampleViewModel : INotifyPropertyChanged
-                {
-                    public event PropertyChangedEventHandler? PropertyChanged;
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<INotifyPropertyChangedGenerator>(source, "MVVMTK0004");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void DuplicateINotifyPropertyChangedInterfaceForINotifyPropertyChangedAttributeError_Inherited()
-        {
-            string source = @"
-            using System.ComponentModel;
-            using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-            namespace Microsoft.Toolkit.Mvvm.ComponentModel
-            {
-                public abstract class ObservableObject : INotifyPropertyChanged, INotifyPropertyChanging
-                {
-                    public event PropertyChangedEventHandler? PropertyChanged;
-                    public event PropertyChangingEventHandler? PropertyChanging;
-                }
-            }
-
-            namespace MyApp
-            {
-                [INotifyPropertyChanged]
-                public partial class SampleViewModel : ObservableObject
-                {
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<INotifyPropertyChangedGenerator>(source, "MVVMTK0004");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void DuplicateINotifyPropertyChangedInterfaceForObservableObjectAttributeError_Explicit()
-        {
-            string source = @"
-            using System.ComponentModel;
-            using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-            namespace MyApp
-            {
-                [ObservableObject]
-                public partial class SampleViewModel : INotifyPropertyChanged
-                {
-                    public event PropertyChangedEventHandler? PropertyChanged;
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<ObservableObjectGenerator>(source, "MVVMTK0005");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void DuplicateINotifyPropertyChangedInterfaceForObservableObjectAttributeError_Inherited()
-        {
-            string source = @"
-            using System.ComponentModel;
-            using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-            namespace Microsoft.Toolkit.Mvvm.ComponentModel
-            {
-                public abstract class ObservableObject : INotifyPropertyChanged
-                {
-                    public event PropertyChangedEventHandler? PropertyChanged;
-                }
-            }
-
-            namespace MyApp
-            {
-                [ObservableObject]
-                public partial class SampleViewModel : ObservableObject
-                {
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<ObservableObjectGenerator>(source, "MVVMTK0005");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void DuplicateINotifyPropertyChangingInterfaceForObservableObjectAttributeError_Explicit()
-        {
-            string source = @"
-            using System.ComponentModel;
-            using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-            namespace MyApp
-            {
-                [ObservableObject]
-                public partial class SampleViewModel : INotifyPropertyChanging
-                {
-                    public event PropertyChangingEventHandler? PropertyChanging;
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<ObservableObjectGenerator>(source, "MVVMTK0006");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void DuplicateINotifyPropertyChangingInterfaceForObservableObjectAttributeError_Inherited()
-        {
-            string source = @"
-            using System.ComponentModel;
-            using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-            namespace MyApp
-            {
-                public abstract class MyBaseViewModel : INotifyPropertyChanging
-                {
-                    public event PropertyChangingEventHandler? PropertyChanging;
-                }
-
-                [ObservableObject]
-                public partial class SampleViewModel : MyBaseViewModel
-                {
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<ObservableObjectGenerator>(source, "MVVMTK0006");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void DuplicateObservableRecipientError()
-        {
-            string source = @"
-            using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-            namespace Microsoft.Toolkit.Mvvm.ComponentModel
-            {
-                public abstract class ObservableRecipient : ObservableObject
-                {
-                }
-            }
-
-            namespace MyApp
-            {
-                [ObservableRecipient]
-                public partial class SampleViewModel : ObservableRecipient
-                {
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<ObservableRecipientGenerator>(source, "MVVMTK0007");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void MissingBaseObservableObjectFunctionalityError()
-        {
-            string source = @"
-            using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-            namespace MyApp
-            {
-                [ObservableRecipient]
-                public partial class SampleViewModel
-                {
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<ObservableRecipientGenerator>(source, "MVVMTK0008");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void MissingObservableValidatorInheritanceError()
-        {
-            string source = @"
-            using System.ComponentModel.DataAnnotations;
-            using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-            namespace MyApp
-            {
-                [INotifyPropertyChanged]
-                public partial class SampleViewModel
-                {
-                    [ObservableProperty]
-                    [Required]
-                    private string name;
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<ObservablePropertyGenerator>(source, "MVVMTK0009");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void InvalidICommandMethodSignatureError()
-        {
-            string source = @"
-            using Microsoft.Toolkit.Mvvm.Input;
-
-            namespace MyApp
-            {
-                public partial class SampleViewModel
-                {
-                    [ICommand]
-                    private string GreetUser() => ""Hello world!"";
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<ICommandGenerator>(source, "MVVMTK0012");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void UnsupportedCSharpLanguageVersion_FromINotifyPropertyChangedGenerator()
-        {
-            string source = @"
-            using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-            namespace MyApp
-            {
-                [INotifyPropertyChanged]
-                public partial class SampleViewModel
-                {
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<INotifyPropertyChangedGenerator>(
-                CSharpSyntaxTree.ParseText(source, CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp7_3)),
-                "MVVMTK0013");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void UnsupportedCSharpLanguageVersion_FromObservableObjectGenerator()
-        {
-            string source = @"
-            using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-            namespace MyApp
-            {
-                [ObservableObject]
-                public partial class SampleViewModel
-                {
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<ObservableObjectGenerator>(
-                CSharpSyntaxTree.ParseText(source, CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp7_3)),
-                "MVVMTK0013");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void UnsupportedCSharpLanguageVersion_FromObservablePropertyGenerator()
-        {
-            string source = @"
-            using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-            namespace MyApp
-            {
-                [INotifyPropertyChanged]
-                public partial class SampleViewModel
-                {
-                    [ObservableProperty]
-                    private string name;
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<ObservablePropertyGenerator>(
-                CSharpSyntaxTree.ParseText(source, CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp7_3)),
-                "MVVMTK0013");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void UnsupportedCSharpLanguageVersion_FromObservableValidatorValidateAllPropertiesGenerator()
-        {
-            string source = @"
-            using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-            namespace MyApp
-            {
-                public partial class SampleViewModel : ObservableValidator
-                {
-                    [Required]
-                    public string Name { get; set; }
-                }
-            }";
-
-            // This is explicitly allowed in C# < 9.0, as it doesn't use any new features
-            VerifyGeneratedDiagnostics<ObservableValidatorValidateAllPropertiesGenerator>(
-                CSharpSyntaxTree.ParseText(source, CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp7_3)));
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void UnsupportedCSharpLanguageVersion_FromICommandGenerator()
-        {
-            string source = @"
-            using Microsoft.Toolkit.Mvvm.Input;
-
-            namespace MyApp
-            {
-                public partial class SampleViewModel
-                {
-                    [ICommand]
-                    private void GreetUser(object value)
-                    {
-                    }
-                }
-            }";
-
-            VerifyGeneratedDiagnostics<ICommandGenerator>(
-                CSharpSyntaxTree.ParseText(source, CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp7_3)),
-                "MVVMTK0013");
-        }
-
-        [TestCategory("Mvvm")]
-        [TestMethod]
-        public void UnsupportedCSharpLanguageVersion_FromIMessengerRegisterAllGenerator()
-        {
-            string source = @"
-            using Microsoft.Toolkit.Mvvm.Messaging;
-
-            namespace MyApp
-            {
-                public class MyMessage
-                {
-                }
-
-                public partial class SampleViewModel : IRecipient<MyMessage>
-                {
-                    public void Receive(MyMessage message)
-                    {
-                    }
-                }
-            }";
-
-            // This is explicitly allowed in C# < 9.0, as it doesn't use any new features
-            VerifyGeneratedDiagnostics<IMessengerRegisterAllGenerator>(
-                CSharpSyntaxTree.ParseText(source, CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp7_3)));
-        }
-
-        /// <summary>
-        /// Verifies the output of a source generator.
-        /// </summary>
-        /// <typeparam name="TGenerator">The generator type to use.</typeparam>
-        /// <param name="source">The input source to process.</param>
-        /// <param name="diagnosticsIds">The diagnostic ids to expect for the input source code.</param>
-        private static void VerifyGeneratedDiagnostics<TGenerator>(string source, params string[] diagnosticsIds)
-            where TGenerator : class, ISourceGenerator, new()
-        {
-            VerifyGeneratedDiagnostics<TGenerator>(CSharpSyntaxTree.ParseText(source), diagnosticsIds);
-        }
-
-        /// <summary>
-        /// Verifies the output of a source generator.
-        /// </summary>
-        /// <typeparam name="TGenerator">The generator type to use.</typeparam>
-        /// <param name="syntaxTree">The input source tree to process.</param>
-        /// <param name="diagnosticsIds">The diagnostic ids to expect for the input source code.</param>
-        private static void VerifyGeneratedDiagnostics<TGenerator>(SyntaxTree syntaxTree, params string[] diagnosticsIds)
-            where TGenerator : class, ISourceGenerator, new()
-        {
-            Type observableObjectType = typeof(ObservableObject);
-            Type validationAttributeType = typeof(ValidationAttribute);
-
-            IEnumerable<MetadataReference> references =
-                from assembly in AppDomain.CurrentDomain.GetAssemblies()
-                where !assembly.IsDynamic
-                let reference = MetadataReference.CreateFromFile(assembly.Location)
-                select reference;
-
-            CSharpCompilation compilation = CSharpCompilation.Create(
-                "original",
-                new SyntaxTree[] { syntaxTree },
-                references,
-                new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
-
-            ISourceGenerator generator = new TGenerator();
-
-            CSharpGeneratorDriver driver = CSharpGeneratorDriver.Create(new[] { generator }, parseOptions: (CSharpParseOptions)syntaxTree.Options);
-
-            driver.RunGeneratorsAndUpdateCompilation(compilation, out Compilation outputCompilation, out ImmutableArray<Diagnostic> diagnostics);
-
-            HashSet<string> resultingIds = diagnostics.Select(diagnostic => diagnostic.Id).ToHashSet();
-
-            Assert.IsTrue(resultingIds.SetEquals(diagnosticsIds));
-
-            GC.KeepAlive(observableObjectType);
-            GC.KeepAlive(validationAttributeType);
-        }
-    }
-}
diff --git a/UnitTests/UnitTests.SourceGenerators/UnitTests.SourceGenerators.csproj b/UnitTests/UnitTests.SourceGenerators/UnitTests.SourceGenerators.csproj
deleted file mode 100644
index 81fd8f291e2..00000000000
--- a/UnitTests/UnitTests.SourceGenerators/UnitTests.SourceGenerators.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
-    <IsPackable>false</IsPackable>
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.10.0-1.final" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm.SourceGenerators\Microsoft.Toolkit.Mvvm.SourceGenerators.csproj" />
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/UnitTests/UnitTests.UWP/Helpers/JsonObjectSerializer2.cs b/UnitTests/UnitTests.UWP/Helpers/JsonObjectSerializer2.cs
index 8721acc6920..254b4378b92 100644
--- a/UnitTests/UnitTests.UWP/Helpers/JsonObjectSerializer2.cs
+++ b/UnitTests/UnitTests.UWP/Helpers/JsonObjectSerializer2.cs
@@ -11,7 +11,7 @@ namespace UnitTests.Helpers
 {
     /// <summary>
     /// This is a Serializer which should mimic the previous functionality of 6.1.1 release of the Toolkit with Newtonsoft.Json.
-    /// Based on <see cref="Microsoft.Toolkit.Helpers.IObjectSerializer"/>.
+    /// Based on <see cref="IObjectSerializer"/>.
     /// </summary>
     internal class JsonObjectSerializer2 : IObjectSerializer
     {
diff --git a/UnitTests/UnitTests.UWP/Helpers/SystemTextJsonSerializer2.cs b/UnitTests/UnitTests.UWP/Helpers/SystemTextJsonSerializer2.cs
index caae64f288c..291480b31d0 100644
--- a/UnitTests/UnitTests.UWP/Helpers/SystemTextJsonSerializer2.cs
+++ b/UnitTests/UnitTests.UWP/Helpers/SystemTextJsonSerializer2.cs
@@ -8,8 +8,8 @@
 namespace UnitTests.Helpers
 {
     /// <summary>
-    /// Example class of writing a new <see cref="IObjectSerializer"/> that uses System.Text.Json.
-    /// Based on <see cref="Microsoft.Toolkit.Helpers.IObjectSerializer"/>.
+    /// Example class of writing a new <see cref="Microsoft.Toolkit.Helpers.IObjectSerializer"/> that uses System.Text.Json.
+    /// Based on <see cref="IObjectSerializer"/>.
     /// </summary>
     internal class SystemTextJsonSerializer2 : IObjectSerializer
     {
diff --git a/UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.cs b/UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.cs
index 35e472be805..6b358b0cde7 100644
--- a/UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.cs
+++ b/UnitTests/UnitTests.UWP/Helpers/Test_ApplicationDataStorageHelper.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.Helpers;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
@@ -237,7 +238,7 @@ public async Task Test_StorageHelper_SubFolderCRUDTest()
             var folderItemsList = folderItems.ToList();
             Assert.AreEqual(1, folderItemsList.Count());
             Assert.AreEqual(fileName, folderItemsList[0].Name);
-            Assert.AreEqual(Microsoft.Toolkit.Helpers.DirectoryItemType.File, folderItemsList[0].ItemType);
+            Assert.AreEqual(DirectoryItemType.File, folderItemsList[0].ItemType);
 
             // Rename a file in a subfolder
             var itemRenamed = await storageHelper.TryRenameItemAsync(filePath, fileName2);
diff --git a/UnitTests/UnitTests.UWP/Helpers/Test_SystemInformation.cs b/UnitTests/UnitTests.UWP/Helpers/Test_SystemInformation.cs
index 466398d6809..b0c3bd0f34c 100644
--- a/UnitTests/UnitTests.UWP/Helpers/Test_SystemInformation.cs
+++ b/UnitTests/UnitTests.UWP/Helpers/Test_SystemInformation.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.Toolkit.Helpers;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Windows.ApplicationModel;
diff --git a/UnitTests/UnitTests.UWP/UI/Collection/DataSource.cs b/UnitTests/UnitTests.UWP/UI/Collection/DataSource.cs
index 0585e83211f..ebb8fe829ce 100644
--- a/UnitTests/UnitTests.UWP/UI/Collection/DataSource.cs
+++ b/UnitTests/UnitTests.UWP/UI/Collection/DataSource.cs
@@ -2,12 +2,12 @@
 // 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.Collections;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Collections;
 
 namespace UnitTests.UI
 {
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index cdbb101c62a..d50b438032e 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -128,6 +128,12 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.12</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit">
+      <Version>7.1.2</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Toolkit.Diagnostics">
+      <Version>7.1.2</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
       <Version>2.7.0</Version>
     </PackageReference>
@@ -286,14 +292,6 @@
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Microsoft.Toolkit.Diagnostics\Microsoft.Toolkit.Diagnostics.csproj">
-      <Project>{76f89522-ca28-458d-801d-947ab033a758}</Project>
-      <Name>Microsoft.Toolkit.Diagnostics</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.Uwp.Connectivity\Microsoft.Toolkit.Uwp.Connectivity.csproj">
       <Project>{b1e850ff-dde6-44d5-a830-34250e97a687}</Project>
       <Name>Microsoft.Toolkit.Uwp.Connectivity</Name>
@@ -342,10 +340,6 @@
       <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>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
@@ -356,7 +350,6 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
   </ItemGroup>
-  <Import Project="..\UnitTests.Shared\UnitTests.Shared.projitems" Label="Shared" />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
index c8bee2bdaed..966a88255d2 100644
--- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
+++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<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>
@@ -193,10 +193,6 @@
       <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>
   <ItemGroup>
     <Page Include="TestsPage.xaml">
diff --git a/Windows Community Toolkit (NET).slnf b/Windows Community Toolkit (NET).slnf
deleted file mode 100644
index 4f6b2af91f6..00000000000
--- a/Windows Community Toolkit (NET).slnf	
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "solution": {
-    "path": "Windows Community Toolkit.sln",
-    "projects": [
-      "Microsoft.Toolkit.Diagnostics\\Microsoft.Toolkit.Diagnostics.csproj",
-      "Microsoft.Toolkit.HighPerformance\\Microsoft.Toolkit.HighPerformance.csproj",
-      "Microsoft.Toolkit.Mvvm.SourceGenerators\\Microsoft.Toolkit.Mvvm.SourceGenerators.csproj",
-      "Microsoft.Toolkit.Mvvm\\Microsoft.Toolkit.Mvvm.csproj",
-      "Microsoft.Toolkit\\Microsoft.Toolkit.csproj",
-      "UnitTests\\UnitTests.HighPerformance.NetCore\\UnitTests.HighPerformance.NetCore.csproj",
-      "UnitTests\\UnitTests.HighPerformance.Shared\\UnitTests.HighPerformance.Shared.shproj",
-      "UnitTests\\UnitTests.NetCore\\UnitTests.NetCore.csproj",
-      "UnitTests\\UnitTests.NetStandard\\UnitTests.NetStandard.csproj",
-      "UnitTests\\UnitTests.Shared\\UnitTests.Shared.shproj",
-      "UnitTests\\UnitTests.SourceGenerators\\UnitTests.SourceGenerators.csproj",
-    ]
-  }
-}
\ No newline at end of file
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index c09b6446a9a..a0c4a505487 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31605.320
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{9AD30620-667D-433C-9961-8D885EE7B762}"
 EndProject
@@ -34,8 +34,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.Devel
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.Connectivity", "Microsoft.Toolkit.Uwp.Connectivity\Microsoft.Toolkit.Uwp.Connectivity.csproj", "{B1E850FF-DDE6-44D5-A830-34250E97A687}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit", "Microsoft.Toolkit\Microsoft.Toolkit.csproj", "{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.Notifications", "Microsoft.Toolkit.Uwp.Notifications\Microsoft.Toolkit.Uwp.Notifications.csproj", "{97EE849B-403C-490E-80ED-D19D7CC153FD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.Notifications.NetCore", "UnitTests\UnitTests.Notifications.NetCore\UnitTests.Notifications.NetCore.csproj", "{94994424-5F60-4CD8-ABA2-101779066208}"
@@ -75,24 +73,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("{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
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetCore", "UnitTests\UnitTests.NetCore\UnitTests.NetCore.csproj", "{7878CD00-85E8-4D02-9757-8A43DB4C6510}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Layout", "Microsoft.Toolkit.Uwp.UI.Controls.Layout\Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj", "{CB444381-18BA-4A51-BB32-3A498BCC1E99}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.HighPerformance", "Microsoft.Toolkit.HighPerformance\Microsoft.Toolkit.HighPerformance.csproj", "{7E30D48C-4CD8-47BE-B557-10A20391DCC4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.HighPerformance.NetCore", "UnitTests\UnitTests.HighPerformance.NetCore\UnitTests.HighPerformance.NetCore.csproj", "{D9BDBC68-3D0A-47FC-9C88-0BF769101644}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UnitTests.HighPerformance.Shared", "UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.shproj", "{9B3A94A6-0D29-4523-880B-6938E2EFEEF7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HighPerformance", "HighPerformance", "{262CDB74-CF21-47AC-8DD9-CBC33C73B7CF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests.HighPerformance.UWP", "UnitTests\UnitTests.HighPerformance.UWP\UnitTests.HighPerformance.UWP.csproj", "{5524523E-DB0F-41F7-A0D4-43128422A342}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.XamlIslands", "UnitTests\UnitTests.XamlIslands\UnitTests.XamlIslands.csproj", "{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}"
 EndProject
 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "UnitTests.XamlIslands.Package", "UnitTests\UnitTests.XamlIslands.Package\UnitTests.XamlIslands.Package.wapproj", "{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}"
@@ -139,8 +121,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UITests.Tests.Shared", "UIT
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Behaviors", "Microsoft.Toolkit.Uwp.UI.Behaviors\Microsoft.Toolkit.Uwp.UI.Behaviors.csproj", "{D4FF799D-0DF2-495A-ADC9-3BBC4AEF8971}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Diagnostics", "Microsoft.Toolkit.Diagnostics\Microsoft.Toolkit.Diagnostics.csproj", "{76F89522-CA28-458D-801D-947AB033A758}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Media", "Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj", "{43BD2A36-9E12-4788-80AE-2377E41E6D05}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Media.Design\Microsoft.Toolkit.Uwp.UI.Controls.Media.DesignTools.csproj", "{B9940334-BD06-44E2-B9E9-A65DA791CE32}"
@@ -169,27 +149,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Co
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls", "Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj", "{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Mvvm.SourceGenerators", "Microsoft.Toolkit.Mvvm.SourceGenerators\Microsoft.Toolkit.Mvvm.SourceGenerators.csproj", "{E24D1146-5AD8-498F-A518-4890D8BF4937}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.SourceGenerators", "UnitTests\UnitTests.SourceGenerators\UnitTests.SourceGenerators.csproj", "{338C3BE4-2E71-4F21-AD30-03FDBB47A272}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests.NetStandard", "UnitTests\UnitTests.NetStandard\UnitTests.NetStandard.csproj", "{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}"
-EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4
 		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.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{5524523e-db0f-41f7-a0d4-43128422a342}*SharedItemsImports = 4
 		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{5f720475-e263-4a5a-8c88-2b805b45b5bc}*SharedItemsImports = 5
-		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{94994424-5f60-4cd8-aba2-101779066208}*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
 		UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{c8182ef0-77fb-4b43-a588-c71748a309c7}*SharedItemsImports = 5
-		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{d9bdbc68-3d0a-47fc-9c88-0bf769101644}*SharedItemsImports = 5
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -444,26 +412,6 @@ Global
 		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Release|x64.Build.0 = Release|Any CPU
 		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Release|x86.ActiveCfg = Release|Any CPU
 		{B1E850FF-DDE6-44D5-A830-34250E97A687}.Release|x86.Build.0 = Release|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Debug|ARM.Build.0 = Debug|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{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}.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
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Release|ARM.Build.0 = Release|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Release|ARM64.Build.0 = Release|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Release|x64.ActiveCfg = Release|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Release|x64.Build.0 = Release|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Release|x86.ActiveCfg = Release|Any CPU
-		{6FE128A8-CEFA-4A61-A987-EC92DE6B538E}.Release|x86.Build.0 = Release|Any CPU
 		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{97EE849B-403C-490E-80ED-D19D7CC153FD}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -610,46 +558,6 @@ 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}.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
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{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}.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
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|ARM.Build.0 = Release|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|ARM64.Build.0 = Release|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|x64.ActiveCfg = Release|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|x64.Build.0 = Release|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|x86.ActiveCfg = Release|Any CPU
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510}.Release|x86.Build.0 = Release|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -670,74 +578,6 @@ Global
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|x64.Build.0 = Release|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|x86.ActiveCfg = Release|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|x86.Build.0 = Release|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{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}.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
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|ARM.Build.0 = Release|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|ARM64.Build.0 = Release|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|x64.ActiveCfg = Release|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|x64.Build.0 = Release|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|x86.ActiveCfg = Release|Any CPU
-		{7E30D48C-4CD8-47BE-B557-10A20391DCC4}.Release|x86.Build.0 = Release|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|ARM.Build.0 = Debug|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{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}.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
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|ARM.Build.0 = Release|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|ARM64.Build.0 = Release|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|x64.ActiveCfg = Release|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|x64.Build.0 = Release|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|x86.ActiveCfg = Release|Any CPU
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644}.Release|x86.Build.0 = Release|Any CPU
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|Any CPU.Build.0 = Debug|x86
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|ARM.ActiveCfg = Debug|ARM
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|ARM.Build.0 = Debug|ARM
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|ARM.Deploy.0 = Debug|ARM
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|ARM64.Build.0 = Debug|ARM64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|x64.ActiveCfg = Debug|x64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|x64.Build.0 = Debug|x64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Debug|x64.Deploy.0 = Debug|x64
-		{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}.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
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|ARM.Build.0 = Release|ARM
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|ARM.Deploy.0 = Release|ARM
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|ARM64.ActiveCfg = Release|ARM64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|ARM64.Build.0 = Release|ARM64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|ARM64.Deploy.0 = Release|ARM64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x64.ActiveCfg = Release|x64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x64.Build.0 = Release|x64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x64.Deploy.0 = Release|x64
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x86.ActiveCfg = Release|x86
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x86.Build.0 = Release|x86
-		{5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x86.Deploy.0 = Release|x86
 		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
@@ -968,26 +808,6 @@ Global
 		{D4FF799D-0DF2-495A-ADC9-3BBC4AEF8971}.Release|x64.Build.0 = Release|Any CPU
 		{D4FF799D-0DF2-495A-ADC9-3BBC4AEF8971}.Release|x86.ActiveCfg = Release|Any CPU
 		{D4FF799D-0DF2-495A-ADC9-3BBC4AEF8971}.Release|x86.Build.0 = Release|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Debug|ARM.Build.0 = Debug|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Debug|x64.Build.0 = Debug|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Debug|x86.Build.0 = Debug|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Release|ARM.ActiveCfg = Release|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Release|ARM.Build.0 = Release|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Release|ARM64.Build.0 = Release|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Release|x64.ActiveCfg = Release|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Release|x64.Build.0 = Release|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Release|x86.ActiveCfg = Release|Any CPU
-		{76F89522-CA28-458D-801D-947AB033A758}.Release|x86.Build.0 = Release|Any CPU
 		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1148,66 +968,6 @@ Global
 		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x64.Build.0 = Release|Any CPU
 		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x86.ActiveCfg = Release|Any CPU
 		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Release|x86.Build.0 = Release|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|ARM.Build.0 = Debug|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|x64.Build.0 = Debug|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Debug|x86.Build.0 = Debug|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|ARM.ActiveCfg = Release|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|ARM.Build.0 = Release|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|ARM64.Build.0 = Release|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|x64.ActiveCfg = Release|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|x64.Build.0 = Release|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|x86.ActiveCfg = Release|Any CPU
-		{E24D1146-5AD8-498F-A518-4890D8BF4937}.Release|x86.Build.0 = Release|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|ARM.Build.0 = Debug|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|x64.Build.0 = Debug|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Debug|x86.Build.0 = Debug|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|Any CPU.Build.0 = Release|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|ARM.ActiveCfg = Release|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|ARM.Build.0 = Release|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|ARM64.Build.0 = Release|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|x64.ActiveCfg = Release|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|x64.Build.0 = Release|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|x86.ActiveCfg = Release|Any CPU
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272}.Release|x86.Build.0 = Release|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Debug|ARM.Build.0 = Debug|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Debug|x64.Build.0 = Debug|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Debug|x86.Build.0 = Debug|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Release|ARM.ActiveCfg = Release|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Release|ARM.Build.0 = Release|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Release|ARM64.Build.0 = Release|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Release|x64.ActiveCfg = Release|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Release|x64.Build.0 = Release|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Release|x86.ActiveCfg = Release|Any CPU
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1228,13 +988,7 @@ Global
 		{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{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}
-		{7878CD00-85E8-4D02-9757-8A43DB4C6510} = {B30036C4-D514-4E5B-A323-587A061772CE}
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
-		{D9BDBC68-3D0A-47FC-9C88-0BF769101644} = {262CDB74-CF21-47AC-8DD9-CBC33C73B7CF}
-		{9B3A94A6-0D29-4523-880B-6938E2EFEEF7} = {262CDB74-CF21-47AC-8DD9-CBC33C73B7CF}
-		{262CDB74-CF21-47AC-8DD9-CBC33C73B7CF} = {B30036C4-D514-4E5B-A323-587A061772CE}
-		{5524523E-DB0F-41F7-A0D4-43128422A342} = {262CDB74-CF21-47AC-8DD9-CBC33C73B7CF}
 		{F5929F8E-7BC5-4A7B-A92A-AC751F7906E4} = {C79029AF-2E9B-4466-BAC4-1A41B281EAE6}
 		{DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC} = {C79029AF-2E9B-4466-BAC4-1A41B281EAE6}
 		{C79029AF-2E9B-4466-BAC4-1A41B281EAE6} = {B30036C4-D514-4E5B-A323-587A061772CE}
@@ -1258,8 +1012,6 @@ Global
 		{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{3307BC1D-5D71-41C6-A1B3-B113B8242D08} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
 		{099B60FD-DAD6-4648-9DE2-8DBF9DCD9557} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC}
-		{338C3BE4-2E71-4F21-AD30-03FDBB47A272} = {B30036C4-D514-4E5B-A323-587A061772CE}
-		{D9C82C0D-31D7-4888-B024-3CF3A4F54FE1} = {B30036C4-D514-4E5B-A323-587A061772CE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}
diff --git a/build/build.cake b/build/build.cake
index f4f8558189a..585ad201e90 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -270,18 +270,6 @@ Task("Test")
         ArgumentCustomization = arg => arg.Append($"-s {baseDir}/.runsettings /p:Platform=AnyCPU"),
     };
     DotNetCoreTest(file.FullPath, testSettings);
-}).DoesForEach(GetFiles(baseDir + "/**/UnitTests.SourceGenerators.csproj"), (file) =>
-{
-    Information("\nRunning NetCore Source Generator Unit Tests");
-    var testSettings = new DotNetCoreTestSettings
-    {
-        Configuration = configuration,
-        NoBuild = true,
-        Loggers = new[] { "trx;LogFilePrefix=VsTestResults" },
-        Verbosity = DotNetCoreVerbosity.Normal,
-        ArgumentCustomization = arg => arg.Append($"-s {baseDir}/.runsettings /p:Platform=AnyCPU"),
-    };
-    DotNetCoreTest(file.FullPath, testSettings);
 }).DeferOnError();
 
 Task("UITest")