diff --git a/Microsoft.Toolkit.Diagnostics/Extensions/TypeExtensions.cs b/Microsoft.Toolkit.Diagnostics/Extensions/TypeExtensions.cs index 903f9aab52b..f4a162243d7 100644 --- a/Microsoft.Toolkit.Diagnostics/Extensions/TypeExtensions.cs +++ b/Microsoft.Toolkit.Diagnostics/Extensions/TypeExtensions.cs @@ -11,7 +11,7 @@ #endif using System.Runtime.CompilerServices; -namespace Microsoft.Toolkit.Extensions +namespace Microsoft.Toolkit.Diagnostics { /// /// Helpers for working with types. diff --git a/Microsoft.Toolkit.Diagnostics/Extensions/ValueTypeExtensions.cs b/Microsoft.Toolkit.Diagnostics/Extensions/ValueTypeExtensions.cs index 2cd621d7316..47b4e03cb40 100644 --- a/Microsoft.Toolkit.Diagnostics/Extensions/ValueTypeExtensions.cs +++ b/Microsoft.Toolkit.Diagnostics/Extensions/ValueTypeExtensions.cs @@ -7,7 +7,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace Microsoft.Toolkit.Extensions +namespace Microsoft.Toolkit.Diagnostics { /// /// Helpers for working with value types. diff --git a/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.g.cs b/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.g.cs index 1499c68fccc..04dc2ebc806 100644 --- a/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.g.cs +++ b/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.g.cs @@ -8,7 +8,6 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.Toolkit.Extensions; namespace Microsoft.Toolkit.Diagnostics { diff --git a/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.tt b/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.tt index 83e74189031..65bf3d46b47 100644 --- a/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.tt +++ b/Microsoft.Toolkit.Diagnostics/Generated/ThrowHelper.Collection.tt @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.Toolkit.Extensions; namespace Microsoft.Toolkit.Diagnostics { diff --git a/Microsoft.Toolkit.Diagnostics/Guard.cs b/Microsoft.Toolkit.Diagnostics/Guard.cs index 745a9067106..7ff4f1e232d 100644 --- a/Microsoft.Toolkit.Diagnostics/Guard.cs +++ b/Microsoft.Toolkit.Diagnostics/Guard.cs @@ -6,9 +6,6 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; -#if NETSTANDARD1_4 -using Microsoft.Toolkit.Extensions; -#endif namespace Microsoft.Toolkit.Diagnostics { diff --git a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Collection.Generic.ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/Internals/Guard.Collection.Generic.ThrowHelper.cs index 0353f63d25d..6dd631b9835 100644 --- a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Collection.Generic.ThrowHelper.cs +++ b/Microsoft.Toolkit.Diagnostics/Internals/Guard.Collection.Generic.ThrowHelper.cs @@ -4,7 +4,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using Microsoft.Toolkit.Extensions; namespace Microsoft.Toolkit.Diagnostics { diff --git a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Generic.ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Generic.ThrowHelper.cs index dd7cc5c2abc..02e563017f2 100644 --- a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Generic.ThrowHelper.cs +++ b/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Generic.ThrowHelper.cs @@ -4,7 +4,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using Microsoft.Toolkit.Extensions; namespace Microsoft.Toolkit.Diagnostics { diff --git a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Numeric.ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Numeric.ThrowHelper.cs index 98ea1cf68f4..06b83d65c26 100644 --- a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Numeric.ThrowHelper.cs +++ b/Microsoft.Toolkit.Diagnostics/Internals/Guard.Comparable.Numeric.ThrowHelper.cs @@ -4,7 +4,6 @@ using System; using System.Diagnostics.CodeAnalysis; -using Microsoft.Toolkit.Extensions; namespace Microsoft.Toolkit.Diagnostics { diff --git a/Microsoft.Toolkit.Diagnostics/Internals/Guard.IO.ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/Internals/Guard.IO.ThrowHelper.cs index a51341c8305..509ded4c6ab 100644 --- a/Microsoft.Toolkit.Diagnostics/Internals/Guard.IO.ThrowHelper.cs +++ b/Microsoft.Toolkit.Diagnostics/Internals/Guard.IO.ThrowHelper.cs @@ -5,7 +5,6 @@ using System; using System.Diagnostics.CodeAnalysis; using System.IO; -using Microsoft.Toolkit.Extensions; namespace Microsoft.Toolkit.Diagnostics { diff --git a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Tasks.ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/Internals/Guard.Tasks.ThrowHelper.cs index a6b9de57009..5ded24ad8b0 100644 --- a/Microsoft.Toolkit.Diagnostics/Internals/Guard.Tasks.ThrowHelper.cs +++ b/Microsoft.Toolkit.Diagnostics/Internals/Guard.Tasks.ThrowHelper.cs @@ -5,7 +5,6 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; -using Microsoft.Toolkit.Extensions; namespace Microsoft.Toolkit.Diagnostics { diff --git a/Microsoft.Toolkit.Diagnostics/Internals/Guard.ThrowHelper.cs b/Microsoft.Toolkit.Diagnostics/Internals/Guard.ThrowHelper.cs index 11cbcda3e82..4043636117b 100644 --- a/Microsoft.Toolkit.Diagnostics/Internals/Guard.ThrowHelper.cs +++ b/Microsoft.Toolkit.Diagnostics/Internals/Guard.ThrowHelper.cs @@ -5,7 +5,6 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Contracts; -using Microsoft.Toolkit.Extensions; namespace Microsoft.Toolkit.Diagnostics { diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs index ccd012f135c..52b145c6140 100644 --- a/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs +++ b/Microsoft.Toolkit.HighPerformance/Buffers/ArrayPoolBufferWriter{T}.cs @@ -9,7 +9,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using Microsoft.Toolkit.HighPerformance.Buffers.Views; -using Microsoft.Toolkit.HighPerformance.Extensions; using Microsoft.Toolkit.HighPerformance.Helpers.Internals; namespace Microsoft.Toolkit.HighPerformance.Buffers diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/ArrayMemoryManager{TFrom,TTo}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/Internals/ArrayMemoryManager{TFrom,TTo}.cs index 7a09d1f9007..79506cc5605 100644 --- a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/ArrayMemoryManager{TFrom,TTo}.cs +++ b/Microsoft.Toolkit.HighPerformance/Buffers/Internals/ArrayMemoryManager{TFrom,TTo}.cs @@ -7,7 +7,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using Microsoft.Toolkit.HighPerformance.Buffers.Internals.Interfaces; -using Microsoft.Toolkit.HighPerformance.Extensions; using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers; namespace Microsoft.Toolkit.HighPerformance.Buffers.Internals diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/RawObjectMemoryManager{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/Internals/RawObjectMemoryManager{T}.cs index 1a173c7ce3b..9f11ec490d8 100644 --- a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/RawObjectMemoryManager{T}.cs +++ b/Microsoft.Toolkit.HighPerformance/Buffers/Internals/RawObjectMemoryManager{T}.cs @@ -8,7 +8,6 @@ using System.Buffers; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Microsoft.Toolkit.HighPerformance.Extensions; using Microsoft.Toolkit.HighPerformance.Helpers; namespace Microsoft.Toolkit.HighPerformance.Buffers.Internals diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/StringMemoryManager{TTo}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/Internals/StringMemoryManager{TTo}.cs index 3a16c0b4794..40a95f2385b 100644 --- a/Microsoft.Toolkit.HighPerformance/Buffers/Internals/StringMemoryManager{TTo}.cs +++ b/Microsoft.Toolkit.HighPerformance/Buffers/Internals/StringMemoryManager{TTo}.cs @@ -7,7 +7,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using Microsoft.Toolkit.HighPerformance.Buffers.Internals.Interfaces; -using Microsoft.Toolkit.HighPerformance.Extensions; using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers; namespace Microsoft.Toolkit.HighPerformance.Buffers.Internals diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs index 174f3a4b613..f8ed69753fb 100644 --- a/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs +++ b/Microsoft.Toolkit.HighPerformance/Buffers/MemoryOwner{T}.cs @@ -11,7 +11,6 @@ using System.Runtime.InteropServices; #endif using Microsoft.Toolkit.HighPerformance.Buffers.Views; -using Microsoft.Toolkit.HighPerformance.Extensions; namespace Microsoft.Toolkit.HighPerformance.Buffers { diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/SpanOwner{T}.cs b/Microsoft.Toolkit.HighPerformance/Buffers/SpanOwner{T}.cs index f7c3863eb5c..6fda53f6fd4 100644 --- a/Microsoft.Toolkit.HighPerformance/Buffers/SpanOwner{T}.cs +++ b/Microsoft.Toolkit.HighPerformance/Buffers/SpanOwner{T}.cs @@ -11,7 +11,6 @@ using System.Runtime.InteropServices; #endif using Microsoft.Toolkit.HighPerformance.Buffers.Views; -using Microsoft.Toolkit.HighPerformance.Extensions; namespace Microsoft.Toolkit.HighPerformance.Buffers { diff --git a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs index 492cca7f1bc..119599db10d 100644 --- a/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs +++ b/Microsoft.Toolkit.HighPerformance/Buffers/StringPool.cs @@ -7,7 +7,6 @@ using System.Diagnostics.Contracts; using System.Runtime.CompilerServices; using System.Text; -using Microsoft.Toolkit.HighPerformance.Extensions; #if !NETSTANDARD1_4 using Microsoft.Toolkit.HighPerformance.Helpers; #endif diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlyRefEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlyRefEnumerable{T}.cs index d58dc41b622..812616503a0 100644 --- a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlyRefEnumerable{T}.cs +++ b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlyRefEnumerable{T}.cs @@ -8,7 +8,6 @@ #if SPAN_RUNTIME_SUPPORT using System.Runtime.InteropServices; #endif -using Microsoft.Toolkit.HighPerformance.Extensions; using Microsoft.Toolkit.HighPerformance.Helpers.Internals; using Microsoft.Toolkit.HighPerformance.Memory.Internals; diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs index a4a4dd7c4aa..24c3bab1bea 100644 --- a/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs +++ b/Microsoft.Toolkit.HighPerformance/Enumerables/ReadOnlySpanTokenizer{T}.cs @@ -76,7 +76,16 @@ public bool MoveNext() { this.start = newEnd; - int index = this.span.Slice(newEnd).IndexOf(this.separator); + // 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) diff --git a/Microsoft.Toolkit.HighPerformance/Enumerables/RefEnumerable{T}.cs b/Microsoft.Toolkit.HighPerformance/Enumerables/RefEnumerable{T}.cs index 656bfe96210..8eaba94e8a2 100644 --- a/Microsoft.Toolkit.HighPerformance/Enumerables/RefEnumerable{T}.cs +++ b/Microsoft.Toolkit.HighPerformance/Enumerables/RefEnumerable{T}.cs @@ -8,7 +8,6 @@ #if SPAN_RUNTIME_SUPPORT using System.Runtime.InteropServices; #endif -using Microsoft.Toolkit.HighPerformance.Extensions; using Microsoft.Toolkit.HighPerformance.Helpers.Internals; #if SPAN_RUNTIME_SUPPORT using Microsoft.Toolkit.HighPerformance.Memory.Internals; diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.1D.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.1D.cs index 6f851c7a968..1aee2e658a7 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.1D.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.1D.cs @@ -15,7 +15,7 @@ using Microsoft.Toolkit.HighPerformance.Helpers.Internals; using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs index 635451b9c53..dc5a332054d 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.2D.cs @@ -14,7 +14,7 @@ using Microsoft.Toolkit.HighPerformance.Helpers.Internals; using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.3D.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.3D.cs index b5671469da9..1b620b0a82d 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.3D.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayExtensions.3D.cs @@ -13,7 +13,7 @@ using Microsoft.Toolkit.HighPerformance.Helpers.Internals; using RuntimeHelpers = Microsoft.Toolkit.HighPerformance.Helpers.Internals.RuntimeHelpers; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolBufferWriterExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolBufferWriterExtensions.cs index 21026113957..61324f0b6f4 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolBufferWriterExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolBufferWriterExtensions.cs @@ -7,9 +7,8 @@ using System.Runtime.CompilerServices; using Microsoft.Toolkit.HighPerformance.Buffers; using Microsoft.Toolkit.HighPerformance.Streams; -using Microsoft.Toolkit.HighPerformance.Streams.Sources; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolExtensions.cs index 1f7341a93e6..5743095e2b7 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/ArrayPoolExtensions.cs @@ -5,7 +5,7 @@ using System; using System.Buffers; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/BoolExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/BoolExtensions.cs index 388529f15dc..77948c6dda4 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/BoolExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/BoolExtensions.cs @@ -6,7 +6,7 @@ using System.Diagnostics.Contracts; using System.Runtime.CompilerServices; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/HashCodeExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/HashCodeExtensions.cs index 2dfab655d8d..a324e7df11a 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/HashCodeExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/HashCodeExtensions.cs @@ -8,7 +8,7 @@ using System.Runtime.CompilerServices; using Microsoft.Toolkit.HighPerformance.Helpers; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/IBufferWriterExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/IBufferWriterExtensions.cs index 07a5bd6c2b8..01c6e486bbc 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/IBufferWriterExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/IBufferWriterExtensions.cs @@ -10,9 +10,8 @@ using System.Runtime.InteropServices; using Microsoft.Toolkit.HighPerformance.Buffers; using Microsoft.Toolkit.HighPerformance.Streams; -using Microsoft.Toolkit.HighPerformance.Streams.Sources; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.cs index cb4ec0f2829..b0971b6c371 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/IMemoryOwnerExtensions.cs @@ -9,7 +9,7 @@ using System.Runtime.CompilerServices; using MemoryStream = Microsoft.Toolkit.HighPerformance.Streams.MemoryStream; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ListExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ListExtensions.cs index ff4b03a0f7e..fa3b47b3c4d 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/ListExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/ListExtensions.cs @@ -10,7 +10,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs index 1feeb36c966..842a388dcff 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/MemoryExtensions.cs @@ -9,7 +9,7 @@ using System.Runtime.InteropServices; using MemoryStream = Microsoft.Toolkit.HighPerformance.Streams.MemoryStream; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs index ad046a1c68f..24f8d75d9ba 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlyMemoryExtensions.cs @@ -12,7 +12,7 @@ using Microsoft.Toolkit.HighPerformance.Buffers.Internals.Interfaces; using MemoryStream = Microsoft.Toolkit.HighPerformance.Streams.MemoryStream; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs index cb793eada03..5a7dc9e5807 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/ReadOnlySpanExtensions.cs @@ -9,7 +9,7 @@ using Microsoft.Toolkit.HighPerformance.Enumerables; using Microsoft.Toolkit.HighPerformance.Helpers.Internals; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs index d82bad3d4db..61365d6c04f 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/SpanExtensions.cs @@ -9,7 +9,7 @@ using Microsoft.Toolkit.HighPerformance.Enumerables; using Microsoft.Toolkit.HighPerformance.Helpers.Internals; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/SpinLockExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/SpinLockExtensions.cs index d17eab8fae4..b1e6df007f1 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/SpinLockExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/SpinLockExtensions.cs @@ -6,7 +6,7 @@ using System.Runtime.CompilerServices; using System.Threading; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/StreamExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/StreamExtensions.cs index 74526cb1f0f..22b91d083b7 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/StreamExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/StreamExtensions.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; #endif -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs b/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs index 9690ad1729e..f83826633e3 100644 --- a/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs +++ b/Microsoft.Toolkit.HighPerformance/Extensions/StringExtensions.cs @@ -11,7 +11,7 @@ using Microsoft.Toolkit.HighPerformance.Enumerables; using Microsoft.Toolkit.HighPerformance.Helpers.Internals; -namespace Microsoft.Toolkit.HighPerformance.Extensions +namespace Microsoft.Toolkit.HighPerformance { /// /// Helpers for working with the type. diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Count.cs b/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Count.cs index 54112b551f7..c1131db8565 100644 --- a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Count.cs +++ b/Microsoft.Toolkit.HighPerformance/Helpers/Internals/SpanHelper.Count.cs @@ -6,7 +6,6 @@ using System.Diagnostics.Contracts; using System.Numerics; using System.Runtime.CompilerServices; -using Microsoft.Toolkit.HighPerformance.Extensions; namespace Microsoft.Toolkit.HighPerformance.Helpers.Internals { diff --git a/Microsoft.Toolkit.HighPerformance/Memory/Memory2D{T}.cs b/Microsoft.Toolkit.HighPerformance/Memory/Memory2D{T}.cs index 3bc114a380d..c473c8af494 100644 --- a/Microsoft.Toolkit.HighPerformance/Memory/Memory2D{T}.cs +++ b/Microsoft.Toolkit.HighPerformance/Memory/Memory2D{T}.cs @@ -12,7 +12,6 @@ #if SPAN_RUNTIME_SUPPORT using Microsoft.Toolkit.HighPerformance.Buffers.Internals; #endif -using Microsoft.Toolkit.HighPerformance.Extensions; using Microsoft.Toolkit.HighPerformance.Helpers; using Microsoft.Toolkit.HighPerformance.Memory.Internals; using Microsoft.Toolkit.HighPerformance.Memory.Views; diff --git a/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlyMemory2D{T}.cs b/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlyMemory2D{T}.cs index 3666755e533..69554e2b38a 100644 --- a/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlyMemory2D{T}.cs +++ b/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlyMemory2D{T}.cs @@ -12,7 +12,6 @@ #if SPAN_RUNTIME_SUPPORT using Microsoft.Toolkit.HighPerformance.Buffers.Internals; #endif -using Microsoft.Toolkit.HighPerformance.Extensions; using Microsoft.Toolkit.HighPerformance.Helpers; using Microsoft.Toolkit.HighPerformance.Memory.Internals; using Microsoft.Toolkit.HighPerformance.Memory.Views; diff --git a/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlySpan2D{T}.cs b/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlySpan2D{T}.cs index cd38069dad4..d903ae80f08 100644 --- a/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlySpan2D{T}.cs +++ b/Microsoft.Toolkit.HighPerformance/Memory/ReadOnlySpan2D{T}.cs @@ -8,7 +8,6 @@ using System.Diagnostics.Contracts; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Microsoft.Toolkit.HighPerformance.Extensions; #if !SPAN_RUNTIME_SUPPORT using Microsoft.Toolkit.HighPerformance.Helpers; #endif diff --git a/Microsoft.Toolkit.HighPerformance/Memory/Span2D{T}.cs b/Microsoft.Toolkit.HighPerformance/Memory/Span2D{T}.cs index 88ac3c2c214..9de5cfae8e7 100644 --- a/Microsoft.Toolkit.HighPerformance/Memory/Span2D{T}.cs +++ b/Microsoft.Toolkit.HighPerformance/Memory/Span2D{T}.cs @@ -8,7 +8,6 @@ using System.Diagnostics.Contracts; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Microsoft.Toolkit.HighPerformance.Extensions; #if !SPAN_RUNTIME_SUPPORT using Microsoft.Toolkit.HighPerformance.Helpers; #endif diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayBufferWriterOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayBufferWriterOwner.cs index 0a534dc2af6..d7788b6c93e 100644 --- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayBufferWriterOwner.cs +++ b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayBufferWriterOwner.cs @@ -7,7 +7,7 @@ using System.Runtime.CompilerServices; using Microsoft.Toolkit.HighPerformance.Buffers; -namespace Microsoft.Toolkit.HighPerformance.Streams.Sources +namespace Microsoft.Toolkit.HighPerformance.Streams { /// /// An implementation wrapping an instance. diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs index 5018354e74f..a199c32a476 100644 --- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs +++ b/Microsoft.Toolkit.HighPerformance/Streams/Sources/ArrayOwner.cs @@ -6,7 +6,6 @@ using System.Runtime.CompilerServices; #if SPAN_RUNTIME_SUPPORT using System.Runtime.InteropServices; -using Microsoft.Toolkit.HighPerformance.Extensions; #endif namespace Microsoft.Toolkit.HighPerformance.Streams diff --git a/Microsoft.Toolkit.HighPerformance/Streams/Sources/IBufferWriterOwner.cs b/Microsoft.Toolkit.HighPerformance/Streams/Sources/IBufferWriterOwner.cs index 2580037f6d9..8f6146536bc 100644 --- a/Microsoft.Toolkit.HighPerformance/Streams/Sources/IBufferWriterOwner.cs +++ b/Microsoft.Toolkit.HighPerformance/Streams/Sources/IBufferWriterOwner.cs @@ -7,7 +7,7 @@ using System.Runtime.CompilerServices; using Microsoft.Toolkit.HighPerformance.Buffers; -namespace Microsoft.Toolkit.HighPerformance.Streams.Sources +namespace Microsoft.Toolkit.HighPerformance.Streams { /// /// An implementation wrapping an instance. diff --git a/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs b/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs index f48045826e2..c1746832989 100644 --- a/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs +++ b/Microsoft.Toolkit.Mvvm/Messaging/IMessengerExtensions.cs @@ -132,7 +132,7 @@ static Action GetRegistrationAction(Type type, Metho } // Get or compute the registration methods for the current recipient type. - // As in Microsoft.Toolkit.Extensions.TypeExtensions.ToTypeString, we use a lambda + // 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. diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs index bafe8f6939e..c4d953f95d8 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs +++ b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/BluetoothLEHelper.cs @@ -8,7 +8,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.Toolkit.Uwp.Extensions; using Windows.Devices.Bluetooth; using Windows.Devices.Bluetooth.Advertisement; using Windows.Devices.Enumeration; diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs index 6aec998c966..352a1949bd5 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs +++ b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableBluetoothLEDevice.cs @@ -11,7 +11,6 @@ using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; -using Microsoft.Toolkit.Uwp.Extensions; using Windows.Devices.Bluetooth; using Windows.Devices.Bluetooth.GenericAttributeProfile; using Windows.Devices.Enumeration; diff --git a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableGattCharacteristics.cs b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableGattCharacteristics.cs index e00b722967b..16b3c929ad9 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableGattCharacteristics.cs +++ b/Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableGattCharacteristics.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Runtime.CompilerServices; using System.Threading.Tasks; -using Microsoft.Toolkit.Uwp.Extensions; using Windows.Devices.Bluetooth; using Windows.Devices.Bluetooth.GenericAttributeProfile; using Windows.Security.Cryptography; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index e5d037b0940..f192b2abe8d 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -868,9 +868,6 @@ ObjectStoragePage.xaml - - SurfaceDialTextboxPage.xaml - SystemInformationPage.xaml @@ -1308,10 +1305,6 @@ Designer MSBuild:Compile - - Designer - MSBuild:Compile - MSBuild:Compile Designer diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml index bda1ccfa186..992fa697df5 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml @@ -4,7 +4,7 @@ xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Pages" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:sampleapp="using:Microsoft.Toolkit.Uwp.SampleApp" @@ -74,7 +74,7 @@ diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/IconExtensions/IconExtensionsXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/IconExtensions/IconExtensionsXaml.bind index b43e7139b03..927dc9dcaa7 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/IconExtensions/IconExtensionsXaml.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/IconExtensions/IconExtensionsXaml.bind @@ -4,7 +4,7 @@ xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages.IconExtensionsPage" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" mc:Ignorable="d"> - - - + + + - - - + + + - - + + - - + + - - + + + Icon="{ui:BitmapIcon Source=/Assets/ToolkitLogo.png}" /> + Icon="{ui:BitmapIcon Source=/Assets/mslogo.png}" /> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageCache/ImageCachePage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageCache/ImageCachePage.xaml.cs index ab0ed961847..d09d27e8720 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageCache/ImageCachePage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageCache/ImageCachePage.xaml.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.Toolkit.Uwp.SampleApp.Data; using Microsoft.Toolkit.Uwp.UI; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageCropper/ImageCropperPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageCropper/ImageCropperPage.xaml.cs index 7dcc30bfb55..e24ce69a601 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageCropper/ImageCropperPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageCropper/ImageCropperPage.xaml.cs @@ -5,8 +5,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.Storage; using Windows.Storage.Pickers; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs index 97b4412fa95..20d12f4da1f 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ImageEx/ImageExPage.xaml.cs @@ -8,7 +8,6 @@ using Microsoft.Toolkit.Uwp.SampleApp.Data; using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media.Imaging; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsCode.bind index 542f84e2fe3..a0580224c6a 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsCode.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsCode.bind @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations" mc:Ignorable="d"> @@ -16,7 +16,7 @@ Background="Red" Canvas.Top="100" Canvas.Left="100" - extensions:VisualExtensions.CenterPoint="50,50,0"> + ui:VisualExtensions.CenterPoint="50,50,0"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsPage.xaml index e9a7b685520..e3389de7f57 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsPage.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations" mc:Ignorable="d"> @@ -34,7 +34,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsPage.xaml.cs index b967f0c0767..4ca01d0139c 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsPage.xaml.cs @@ -4,7 +4,7 @@ using System; using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; +using Microsoft.Toolkit.Uwp.UI; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Hosting; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs index 22204438851..7009a18297c 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs @@ -5,8 +5,8 @@ using System; using System.Collections.Generic; using System.Windows.Input; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InfiniteCanvas/InfiniteCanvasPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InfiniteCanvas/InfiniteCanvasPage.xaml.cs index 630f665750a..950cc8d7ef2 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InfiniteCanvas/InfiniteCanvasPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InfiniteCanvas/InfiniteCanvasPage.xaml.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.Storage; using Windows.Storage.Pickers; using Windows.UI.Popups; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ItemsReorderAnimation/ItemsReorderAnimationPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ItemsReorderAnimation/ItemsReorderAnimationPage.xaml.cs index 398dac81217..9662736967e 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ItemsReorderAnimation/ItemsReorderAnimationPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ItemsReorderAnimation/ItemsReorderAnimationPage.xaml.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Toolkit.Uwp.UI.Extensions; +using Microsoft.Toolkit.Uwp.UI; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsCode.bind index 531b584d198..3b2319a87a3 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsCode.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsCode.bind @@ -3,7 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" mc:Ignorable="d"> @@ -23,10 +23,10 @@ Margin="12" ItemTemplate="{StaticResource NormalTemplate}" IsItemClickEnabled="True" - extensions:ListViewExtensions.Command="{Binding SampleCommand}" - extensions:ListViewExtensions.AlternateColor="#33AAAAAA" - extensions:ListViewExtensions.AlternateItemTemplate="{StaticResource AlternateTemplate}" - extensions:ListViewExtensions.StretchItemContainerDirection="Both"> + ui:ListViewExtensions.Command="{Binding SampleCommand}" + ui:ListViewExtensions.AlternateColor="#33AAAAAA" + ui:ListViewExtensions.AlternateItemTemplate="{StaticResource AlternateTemplate}" + ui:ListViewExtensions.StretchItemContainerDirection="Both"> \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml index 2aac79cf097..b60539a8100 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> @@ -22,10 +22,10 @@ diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml.cs index 27e54614340..aa429b0d447 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml.cs @@ -6,7 +6,7 @@ using System.Windows.Input; using Microsoft.Toolkit.Uwp.SampleApp.Common; using Microsoft.Toolkit.Uwp.SampleApp.Data; -using Microsoft.Toolkit.Uwp.UI.Extensions; +using Microsoft.Toolkit.Uwp.UI; using Windows.UI.Popups; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs index eec283755c3..88e0c8839e1 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System.Threading.Tasks; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/MarkdownTextBlockPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/MarkdownTextBlockPage.xaml.cs index 4c597e0ecc2..750bd19d24c 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/MarkdownTextBlockPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/MarkdownTextBlockPage.xaml.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.ApplicationModel; using Windows.Storage; using Windows.System; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/MenuPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/MenuPage.xaml.cs index 253ec55fe62..e2dc6201445 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/MenuPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Menu/MenuPage.xaml.cs @@ -2,8 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Mouse/MouseCursorPage.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Mouse/MouseCursorPage.bind index 4674d937ffa..55fa0cd7304 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Mouse/MouseCursorPage.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Mouse/MouseCursorPage.bind @@ -1,6 +1,6 @@ + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"> \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Mouse/MouseCursorPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Mouse/MouseCursorPage.xaml index 976132e6c32..7d087fc21b4 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Mouse/MouseCursorPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Mouse/MouseCursorPage.xaml @@ -1,7 +1,7 @@  + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"> \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OnDevice/OnDeviceXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OnDevice/OnDeviceXaml.bind index 9fdbd2df867..72635e973b9 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OnDevice/OnDeviceXaml.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OnDevice/OnDeviceXaml.bind @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:core="using:Microsoft.Xaml.Interactions.Core" - xmlns:markup="using:Microsoft.Toolkit.Uwp.UI.Extensions.Markup" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" mc:Ignorable="d"> @@ -20,12 +20,12 @@ TextWrapping="Wrap" Style="{StaticResource BodyTextBlockStyle}"/> - + - + - @@ -34,8 +34,8 @@ Height="100" HorizontalAlignment="Left"> - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OrbitView/OrbitViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OrbitView/OrbitViewPage.xaml.cs index 24e29bead1e..c220eaf3563 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OrbitView/OrbitViewPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OrbitView/OrbitViewPage.xaml.cs @@ -4,8 +4,8 @@ using System; using System.Collections.ObjectModel; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Popups; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PrintHelper/PrintHelperPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PrintHelper/PrintHelperPage.xaml.cs index 4722e7fe6e2..78f75335be5 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PrintHelper/PrintHelperPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PrintHelper/PrintHelperPage.xaml.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using Microsoft.Toolkit.Uwp.Helpers; -using Microsoft.Toolkit.Uwp.UI.Extensions; +using Microsoft.Toolkit.Uwp.UI; using Windows.Graphics.Printing; using Windows.UI.Popups; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RotatorTile/RotatorTilePage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RotatorTile/RotatorTilePage.xaml.cs index b7966bafc91..379564ed89d 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RotatorTile/RotatorTilePage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RotatorTile/RotatorTilePage.xaml.cs @@ -4,8 +4,8 @@ using System.Collections.ObjectModel; using Microsoft.Toolkit.Uwp.SampleApp.Data; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollHeader/ScrollHeaderPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollHeader/ScrollHeaderPage.xaml.cs index 45aa930c47a..082a95df2c7 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollHeader/ScrollHeaderPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollHeader/ScrollHeaderPage.xaml.cs @@ -4,7 +4,7 @@ using System.Collections.ObjectModel; using Microsoft.Toolkit.Uwp.SampleApp.Models; -using Microsoft.Toolkit.Uwp.UI.Extensions; +using Microsoft.Toolkit.Uwp.UI; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsCode.bind index d6969770a7f..13f16568d3e 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsCode.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsCode.bind @@ -1,5 +1,5 @@ // C# - Scale can be applied to any UIElement. In this case it is an image called ToolkitLogo. -using Microsoft.Toolkit.Uwp.UI.Extensions; +using Microsoft.Toolkit.Uwp.UI; // Binds the Y scroll axis of the ScrollViewer to the Y translation axis of the target listScrollViewer.StartExpressionAnimation(shapesPanel, Axis.Y); diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsPage.xaml index d4da6b9a6da..6076a36d8b3 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsPage.xaml @@ -3,9 +3,8 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors" xmlns:common="using:Microsoft.Toolkit.Uwp.SampleApp.Common" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> @@ -16,7 +15,7 @@ + ui:ScrollViewerExtensions.VerticalScrollBarMargin="{Binding MinHeight, ElementName=MyHeaderGrid, Converter={StaticResource DoubleTopThicknessConverter}}"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsPage.xaml.cs index e9d7602a9d6..566174df2d2 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsPage.xaml.cs @@ -4,8 +4,8 @@ using System.Collections.ObjectModel; using Microsoft.Toolkit.Uwp.SampleApp.Models; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Animations; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsXaml.bind index 6b28c95e185..b94a2beda16 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsXaml.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsXaml.bind @@ -3,7 +3,7 @@ xmlns:common="using:Microsoft.Toolkit.Uwp.SampleApp.Common" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:interactivity="using:Microsoft.Xaml.Interactivity" xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors" @@ -15,8 +15,8 @@ + ui:ScrollViewerExtensions.VerticalScrollBarMargin="{Binding MinHeight, ElementName=MyHeaderGrid, Converter={StaticResource DoubleTopThicknessConverter}}" + ui:ScrollViewerExtensions.EnableMiddleClickScrolling="@[EnableMiddleClickScrolling:Bool:True]"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml.cs index 4d57aa7f183..67d954acfca 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml.cs @@ -4,7 +4,7 @@ using System; using System.Collections.ObjectModel; -using Microsoft.Toolkit.Uwp.UI.Extensions; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.UI.Xaml.Controls; using Windows.UI; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml.cs index 08e01228cb6..635a47cdc1e 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Linq; -using Microsoft.Toolkit.Uwp.UI.Extensions; +using Microsoft.Toolkit.Uwp.UI; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StringExtensions/StringExtensionsPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StringExtensions/StringExtensionsPage.xaml.cs index 8bbe07561ca..728e2e746da 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StringExtensions/StringExtensionsPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StringExtensions/StringExtensionsPage.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.Extensions; using Windows.UI.Text; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxCode.bind index dd0c3d6f8da..71cbd6f092b 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxCode.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxCode.bind @@ -1,28 +1,30 @@ - - + - - - + + + + + + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml deleted file mode 100644 index 08be05fc08f..00000000000 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml.cs deleted file mode 100644 index d550505d6c1..00000000000 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Windows.UI.Xaml.Controls; - -namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages -{ - public sealed partial class SurfaceDialTextboxPage : Page - { - public SurfaceDialTextboxPage() - { - InitializeComponent(); - } - } -} diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMask.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMask.bind index c64fe33e9ad..916f71a7ca1 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMask.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMask.bind @@ -1,6 +1,6 @@ @@ -33,34 +33,34 @@ diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml index 9d84d8086bf..3cff6b59f4b 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml @@ -1,23 +1,23 @@  - + - + - + - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml.cs index 68626db4677..220ffc71b51 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Toolkit.Uwp.UI.Extensions; +using Microsoft.Toolkit.Uwp.UI; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegex.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegex.bind index c9c36e30e51..5d651fef082 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegex.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegex.bind @@ -1,7 +1,7 @@ @@ -34,13 +34,13 @@ - + @@ -48,56 +48,56 @@ - + - + - + - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegexPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegexPage.xaml index 3148fed512b..34fb7dbb9c2 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegexPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegexPage.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:common="using:Microsoft.Toolkit.Uwp.SampleApp.Common" - xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> @@ -14,11 +14,11 @@ - - - - + + + + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs index c954736079f..7ed38b36f40 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextToolbar/TextToolbarPage.xaml.cs @@ -4,11 +4,11 @@ using System; using Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextToolbarSamples; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons; using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown; using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.RichText; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.System; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxPage.xaml.cs index d4470dc3aec..ccb5d9b08ba 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxPage.xaml.cs @@ -9,7 +9,6 @@ using System.Linq; using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Popups; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxXaml.bind index 2426a9ae576..13d10af519a 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxXaml.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TokenizingTextBox/TokenizingTextBoxXaml.bind @@ -3,7 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" - xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages" mc:Ignorable="d"> @@ -35,7 +35,7 @@ diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml index 49a539705d6..1afe03e4eb3 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml @@ -2,11 +2,11 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - extensions:ApplicationViewExtensions.Title="View Extensions" - extensions:TitleBarExtensions.BackgroundColor="Blue" - extensions:TitleBarExtensions.ForegroundColor="White" + ui:ApplicationViewExtensions.Title="View Extensions" + ui:TitleBarExtensions.BackgroundColor="Blue" + ui:TitleBarExtensions.ForegroundColor="White" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml.cs index 5295aedf11d..7702e413b7f 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Toolkit.Uwp.UI.Extensions; +using Microsoft.Toolkit.Uwp.UI; using Windows.UI; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewportBehavior/ViewportBehaviorPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewportBehavior/ViewportBehaviorPage.xaml.cs index 70310796169..a6a531c82e0 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewportBehavior/ViewportBehaviorPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewportBehavior/ViewportBehaviorPage.xaml.cs @@ -6,8 +6,8 @@ using System.Collections.ObjectModel; using System.Linq; using System.Threading.Tasks; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Behaviors; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Microsoft.Xaml.Interactivity; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Visual Extensions/VisualExtensionsCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Visual Extensions/VisualExtensionsCode.bind index 2aa9820a941..deba75d104e 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Visual Extensions/VisualExtensionsCode.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Visual Extensions/VisualExtensionsCode.bind @@ -4,16 +4,16 @@ xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" mc:Ignorable="d"> + ui:VisualExtensions.Opacity="0.5" + ui:VisualExtensions.RotationAngleInDegrees="80" + ui:VisualExtensions.Scale="2, 0.5, 1" + ui:VisualExtensions.NormalizedCenterPoint="0.5" /> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Visual Extensions/VisualExtensionsPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Visual Extensions/VisualExtensionsPage.xaml index 2d9f32890ff..50f0f87c579 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Visual Extensions/VisualExtensionsPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Visual Extensions/VisualExtensionsPage.xaml @@ -2,7 +2,7 @@ x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.VisualExtensionsPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> @@ -11,12 +11,11 @@ + ui:VisualExtensions.CenterPoint="50,50,0" + ui:VisualExtensions.Offset="50" + ui:VisualExtensions.Opacity="0.5" + ui:VisualExtensions.RotationAngleInDegrees="80" + ui:VisualExtensions.Scale="2, 0.5, 1" + ui:VisualExtensions.NormalizedCenterPoint="0.5"/> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapLayout/WrapLayoutPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapLayout/WrapLayoutPage.xaml.cs index 9cd7382b4c5..76f1a6aad5e 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapLayout/WrapLayoutPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapLayout/WrapLayoutPage.xaml.cs @@ -4,8 +4,8 @@ using System; using System.Collections.ObjectModel; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Microsoft.UI.Xaml.Controls; using Windows.UI; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs index 8a586f38d85..38da85a5533 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs @@ -5,8 +5,8 @@ using System; using System.Collections.ObjectModel; using Microsoft.Toolkit.Uwp.SampleApp.Data; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml index 7877c1590c9..dee42559784 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/XamlOnlyPage.xaml @@ -11,6 +11,7 @@ xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media" xmlns:mediaactions="using:Microsoft.Xaml.Interactions.Media" xmlns:triggers="using:Microsoft.Toolkit.Uwp.UI.Triggers" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" mc:Ignorable="d"> @@ -28,6 +29,11 @@ + + + + + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json index 2b5c05458ad..f5a819be31a 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json @@ -1163,10 +1163,9 @@ }, { "Name": "SurfaceDialTextbox", - "Type": "SurfaceDialTextboxPage", "About": "Enables support for Surface Dial on any given Textbox. Rotate the Dial to change the numeric value of the Textbox.", "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Uwp.UI/Extensions/SurfaceDialTextbox", - "XamlCodeFile": "SurfaceDialTextboxCode.bind", + "XamlCodeFile": "/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxCode.bind", "Icon": "/SamplePages/SurfaceDialTextbox/SurfaceDialTextbox.png", "BadgeUpdateVersionRequired": "Anniversary Update required", "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/extensions/SurfaceDialTextboxHelper.md" diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs b/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs index a28da5cbc3e..296a6c2e9a0 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs @@ -7,12 +7,10 @@ using System.Linq; using System.Numerics; using System.Threading.Tasks; -using Microsoft.Toolkit.Uwp.Extensions; -using Microsoft.Toolkit.Uwp.Helpers; using Microsoft.Toolkit.Uwp.SampleApp.Pages; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Animations; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Data; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs b/Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs index 0dd641d3f66..74452900bed 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs @@ -3,9 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Linq; -using Microsoft.Toolkit.Uwp.Extensions; -using Microsoft.Toolkit.Uwp.Helpers; -using Microsoft.Toolkit.Uwp.UI.Extensions; +using Microsoft.Toolkit.Uwp.UI; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Input; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml index d878d82ed0c..a107b2e94fa 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml @@ -4,15 +4,15 @@ xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media" xmlns:winui="using:Microsoft.UI.Xaml.Controls" - extensions:TitleBarExtensions.BackgroundColor="{StaticResource Brand-Color}" - extensions:TitleBarExtensions.ButtonBackgroundColor="{StaticResource Brand-Color}" - extensions:TitleBarExtensions.ButtonForegroundColor="{StaticResource Titlebar-Foreground}" - extensions:TitleBarExtensions.ForegroundColor="{StaticResource Titlebar-Foreground}" + ui:TitleBarExtensions.BackgroundColor="{StaticResource Brand-Color}" + ui:TitleBarExtensions.ButtonBackgroundColor="{StaticResource Brand-Color}" + ui:TitleBarExtensions.ButtonForegroundColor="{StaticResource Titlebar-Foreground}" + ui:TitleBarExtensions.ForegroundColor="{StaticResource Titlebar-Foreground}" SizeChanged="Page_SizeChanged" mc:Ignorable="d"> @@ -145,7 +145,7 @@ + ui:VisualExtensions.NormalizedCenterPoint="0.5"> @@ -424,13 +424,13 @@ Background="Transparent"> + ui:VisualExtensions.CenterPoint="40,60,0"> diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs index f3ae5aba79d..d86df0a0e77 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/ConnectedAnimations/Connected.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media.Animation; diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ImplicitAnimation{TValue,TKeyFrame}.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ImplicitAnimation{TValue,TKeyFrame}.cs index b989f90cc5b..f98baa39fba 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ImplicitAnimation{TValue,TKeyFrame}.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/ImplicitAnimation{TValue,TKeyFrame}.cs @@ -4,7 +4,6 @@ #nullable enable -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Composition; using Windows.UI.Xaml; using static Microsoft.Toolkit.Uwp.UI.Animations.AnimationExtensions; diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/QuaternionAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/QuaternionAnimation.cs index dcd29250b9f..59fd5b0297d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/QuaternionAnimation.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/QuaternionAnimation.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; namespace Microsoft.Toolkit.Uwp.UI.Animations { diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/Vector2Animation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/Vector2Animation.cs index 5c080094181..b0df3a5f860 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/Vector2Animation.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/Vector2Animation.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; namespace Microsoft.Toolkit.Uwp.UI.Animations { diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/Vector3Animation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/Vector3Animation.cs index ed1be8c4bbe..09c0b9f9cd4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/Vector3Animation.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/Vector3Animation.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; namespace Microsoft.Toolkit.Uwp.UI.Animations { diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/Vector4Animation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/Vector4Animation.cs index 818343e55c5..ba1f3f1ba9b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/Vector4Animation.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Custom/Vector4Animation.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; namespace Microsoft.Toolkit.Uwp.UI.Animations { diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/AnchorPointAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/AnchorPointAnimation.cs index 6ccc6fee709..1aecc3761d4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/AnchorPointAnimation.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/AnchorPointAnimation.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Composition; namespace Microsoft.Toolkit.Uwp.UI.Animations diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/CenterPointAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/CenterPointAnimation.cs index a9538e07269..41f19f8e543 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/CenterPointAnimation.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/CenterPointAnimation.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Composition; namespace Microsoft.Toolkit.Uwp.UI.Animations diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/OffsetAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/OffsetAnimation.cs index d5e24649ea4..c084b73bb46 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/OffsetAnimation.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/OffsetAnimation.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Composition; namespace Microsoft.Toolkit.Uwp.UI.Animations diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/OrientationAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/OrientationAnimation.cs index 6b5918971fe..24800a11bdc 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/OrientationAnimation.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/OrientationAnimation.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Composition; namespace Microsoft.Toolkit.Uwp.UI.Animations diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/RotationAxisAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/RotationAxisAnimation.cs index 677791da88d..2220525bb84 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/RotationAxisAnimation.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/RotationAxisAnimation.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Composition; namespace Microsoft.Toolkit.Uwp.UI.Animations diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/ScaleAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/ScaleAnimation.cs index 0ec6660364f..6e50b2b153d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/ScaleAnimation.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/ScaleAnimation.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Composition; namespace Microsoft.Toolkit.Uwp.UI.Animations diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/SizeAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/SizeAnimation.cs index 9643f7670fd..71a5e8364a3 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/SizeAnimation.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/SizeAnimation.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Composition; namespace Microsoft.Toolkit.Uwp.UI.Animations diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/TranslationAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/TranslationAnimation.cs index 80626f63b7f..0f9bc8b1462 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/TranslationAnimation.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Default/TranslationAnimation.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; namespace Microsoft.Toolkit.Uwp.UI.Animations { diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/QuaternionKeyFrame.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/QuaternionKeyFrame.cs index 97ad030e566..05cf0a84668 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/QuaternionKeyFrame.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/QuaternionKeyFrame.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; #nullable enable diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/Vector2KeyFrame.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/Vector2KeyFrame.cs index dd62fca4577..5e6db0a1e13 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/Vector2KeyFrame.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/Vector2KeyFrame.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; #nullable enable diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/Vector3KeyFrame.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/Vector3KeyFrame.cs index 7db405372ef..143e3d70499 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/Vector3KeyFrame.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/Vector3KeyFrame.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; #nullable enable diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/Vector4KeyFrame.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/Vector4KeyFrame.cs index cba7c1b197b..dd9e2ca38bb 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/Vector4KeyFrame.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Xaml/KeyFrames/Vector4KeyFrame.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Numerics; -using Microsoft.Toolkit.Uwp.UI.Extensions; #nullable enable diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/FadeHeaderBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/FadeHeaderBehavior.cs index 231a354515f..374bc22de23 100644 --- a/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/FadeHeaderBehavior.cs +++ b/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/FadeHeaderBehavior.cs @@ -3,8 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Toolkit.Uwp.UI.Animations.Expressions; -using Microsoft.Toolkit.Uwp.UI.Extensions; -using Windows.UI.Composition; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Hosting; diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/QuickReturnHeaderBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/QuickReturnHeaderBehavior.cs index ffe9e518cd5..6c1eb554900 100644 --- a/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/QuickReturnHeaderBehavior.cs +++ b/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/QuickReturnHeaderBehavior.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Toolkit.Uwp.UI.Animations.Expressions; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.Foundation; using Windows.UI.Composition; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/StickyHeaderBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/StickyHeaderBehavior.cs index 5ca0fbf764e..63cf2ce4732 100644 --- a/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/StickyHeaderBehavior.cs +++ b/Microsoft.Toolkit.Uwp.UI.Behaviors/Headers/StickyHeaderBehavior.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Toolkit.Uwp.UI.Animations.Expressions; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.Foundation; using Windows.UI.Composition; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Viewport/ViewportBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Behaviors/Viewport/ViewportBehavior.cs index 8ae55dc0512..400c280edfd 100644 --- a/Microsoft.Toolkit.Uwp.UI.Behaviors/Viewport/ViewportBehavior.cs +++ b/Microsoft.Toolkit.Uwp.UI.Behaviors/Viewport/ViewportBehavior.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Microsoft.Xaml.Interactivity; using Windows.Foundation; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs index e4f62537a46..03f1486227b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs @@ -4,8 +4,6 @@ using System; using System.Linq; -using Microsoft.Toolkit.Uwp.Extensions; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs index 3ccdb9020b4..7a0116546fc 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs @@ -5,8 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Toolkit.Uwp.Extensions; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation; using Windows.UI.Xaml.Controls; @@ -79,7 +77,7 @@ protected override void OnApplyTemplate() VisualStateManager.GoToState(this, StateContentVisible, true); } - AutomationProperties.SetLabeledBy(this, VisualTree.FindDescendant(this)); + AutomationProperties.SetLabeledBy(this, this.FindDescendant()); } /// diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs index 3f8f8a3a5ac..645bfb8b7d7 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.Foundation; using Windows.Foundation.Collections; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs index f2728ec1823..804cbc0195e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs @@ -5,7 +5,6 @@ using System; using System.Collections; using System.Collections.Specialized; -using Microsoft.Toolkit.Uwp.Extensions; using Microsoft.Toolkit.Uwp.Helpers; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs index 08364b7189f..3944cd43dcc 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.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.Uwp.Extensions; using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons; using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons.Common; using Windows.System; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs index 8ea541e1a33..cd9a91848fd 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.Toolkit.Uwp.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs index c1ca4575682..6f8ef32fab3 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.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.Uwp.Extensions; using Windows.System; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs index b537ffebf6c..97bf7d111ec 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs @@ -8,7 +8,6 @@ using System.Numerics; using System.Threading; using System.Threading.Tasks; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.Foundation; using Windows.UI.Composition; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml index 9ad61cd3e4a..120ed76bf49 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml @@ -2,9 +2,9 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters" - xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions" xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters" - xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"> + xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"> @@ -160,8 +160,8 @@ Tag="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=OneWay}"> - + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.cs index 518f0de6790..8fc3f4b8996 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.Toolkit.Uwp.Extensions; using Windows.Foundation; using Windows.System; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Selection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Selection.cs index 278b57df77e..32fa8776aa6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Selection.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Selection.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.ApplicationModel.DataTransfer; using Windows.UI.Core; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs index fac78ce6fe9..13091d9d89e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs @@ -7,8 +7,6 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.Toolkit.Uwp.Deferred; -using Microsoft.Toolkit.Uwp.Extensions; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Microsoft.Toolkit.Uwp.UI.Helpers; using Windows.System; using Windows.UI.Core; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml index 7f81a6d8fbb..aee3fd32508 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml @@ -1,7 +1,7 @@  + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"> @@ -51,9 +51,9 @@ - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs index edbaa29fc71..c05ccc3f6aa 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.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.Uwp.UI.Extensions; using Windows.Foundation; using Windows.System; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs index 9ea1d37f811..a5ba12ae436 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItem.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.Toolkit.Uwp.Extensions; using Microsoft.Toolkit.Uwp.UI.Automation.Peers; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItemAutomationPeer.cs index 57033555a37..a45a1acf191 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItemAutomationPeer.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeItemAutomationPeer.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml.Automation; using Windows.UI.Xaml.Automation.Peers; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs index e2590010e48..0548eced1ba 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs @@ -7,7 +7,6 @@ using System.Collections.ObjectModel; using System.Linq; using Microsoft.Toolkit.Uwp.UI.Automation.Peers; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.Foundation; using Windows.Foundation.Collections; using Windows.UI.Core; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.cs index 31a65945feb..1d73c58e181 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/Carousel.cs @@ -3,10 +3,8 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections; using System.Collections.Generic; using System.Linq; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselPanel.cs index 6e41b5b244a..b3adc973dac 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselPanel.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Carousel/CarouselPanel.cs @@ -3,8 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.Toolkit.Uwp.Extensions; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.Foundation; using Windows.UI; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs index 6b62580b8bd..6b9a74ec62e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.cs @@ -2,10 +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.Reflection; -using Microsoft.Toolkit.Uwp.Extensions; -using Windows.ApplicationModel.Resources; using Windows.UI.Core; using Windows.UI.Xaml; using Windows.UI.Xaml.Automation; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.cs index eed290eb35f..be635d1b2b3 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/LayoutTransformControl/LayoutTransformControl.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; @@ -127,7 +126,7 @@ private static bool IsSizeSmaller(Size a, Size b) private void ProcessTransform() { // Get the transform matrix and apply it - _transformation = MatrixHelperEx.Round(GetTransformMatrix(Transform), DecimalsAfterRound); + _transformation = GetTransformMatrix(Transform).Round(DecimalsAfterRound); if (_matrixTransform != null) { @@ -242,7 +241,8 @@ protected override Size MeasureOverride(Size availableSize) _layoutRoot.Measure(measureSize); // Transform DesiredSize to find its width/height - Rect transformedDesiredRect = MatrixHelperEx.RectTransform(new Rect(0, 0, _layoutRoot.DesiredSize.Width, _layoutRoot.DesiredSize.Height), _transformation); + Rect startingRect = new Rect(0, 0, _layoutRoot.DesiredSize.Width, _layoutRoot.DesiredSize.Height); + Rect transformedDesiredRect = startingRect.Transform(_transformation); Size transformedDesiredSize = new Size(transformedDesiredRect.Width, transformedDesiredRect.Height); // Return result to allocate enough space for the transformation @@ -274,7 +274,8 @@ protected override Size ArrangeOverride(Size finalSize) } // Transform the working size to find its width/height - Rect transformedRect = MatrixHelperEx.RectTransform(new Rect(0, 0, finalSizeTransformed.Width, finalSizeTransformed.Height), _transformation); + Rect startingRect = new Rect(0, 0, finalSizeTransformed.Width, finalSizeTransformed.Height); + Rect transformedRect = startingRect.Transform(_transformation); // Create the Arrange rect to center the transformed content Rect finalRect = new Rect( diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs index 2b117bf37c7..710d5dc5e59 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.ApplicationModel; using Windows.UI.Core; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanel.cs index c39e2311073..cd6a3e92010 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanel.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/OrbitView/OrbitViewPanel.cs @@ -5,8 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Toolkit.Uwp.Extensions; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/MarkdownLinkInline.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/MarkdownLinkInline.cs index dd6a0ba4c5e..e5195fe752c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/MarkdownLinkInline.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Parsers/Markdown/Inlines/MarkdownLinkInline.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; -using Microsoft.Toolkit.Extensions; using Microsoft.Toolkit.Parsers.Core; using Microsoft.Toolkit.Parsers.Markdown.Helpers; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs index c70116e6575..4010af348b3 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.Inlines.cs @@ -258,7 +258,7 @@ protected override async void RenderImage(ImageInline element, IRenderContext co var viewbox = new Viewbox { Child = hyperlinkButton, - StretchDirection = StretchDirection.DownOnly + StretchDirection = Windows.UI.Xaml.Controls.StretchDirection.DownOnly }; viewbox.PointerWheelChanged += Preventative_PointerWheelChanged; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.cs index ba01a601629..2f54929d9dd 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Render/MarkdownRenderer.cs @@ -7,7 +7,6 @@ using Microsoft.Toolkit.Parsers.Markdown; using Microsoft.Toolkit.Parsers.Markdown.Inlines; using Microsoft.Toolkit.Parsers.Markdown.Render; -using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Documents; @@ -215,7 +214,7 @@ private void Preventative_PointerWheelChanged(object sender, Windows.UI.Xaml.Inp return; } - var rootViewer = VisualTree.FindAscendant(RootElement); + var rootViewer = RootElement.FindAscendant(); if (rootViewer != null) { pointerWheelChanged?.Invoke(rootViewer, new object[] { e }); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs index 3029e64d7f8..c8f7c4455ee 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs @@ -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.Uwp.Extensions; using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons; namespace Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarFormats.MarkDown diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs index 9bd48402bff..b6ddfea48c4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs @@ -4,7 +4,6 @@ using System; using System.Linq; -using Microsoft.Toolkit.Uwp.Extensions; using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons; using Microsoft.Toolkit.Uwp.UI.Controls.TextToolbarButtons.Common; using Windows.UI.Text; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.Logic.cs index be6ba99249a..c5add459f29 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.Logic.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.Logic.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.Graphics.Canvas; -using Microsoft.Toolkit.Uwp.Extensions; using Windows.Foundation; using Windows.Graphics.DirectX; using Windows.Graphics.Display; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.cs index d0f0cf56370..143ec1b7b10 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; -using Microsoft.Toolkit.Uwp.Extensions; using Windows.Foundation; using Windows.UI.Core; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Animations.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Animations.cs index 2cd4581f6cc..03ec7f7dca6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Animations.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Animations.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Numerics; -using Microsoft.Toolkit.Uwp.Extensions; using Windows.Foundation; using Windows.UI.Composition; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Events.cs index d019e6df366..a8a7109c735 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Events.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Events.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System; -using Microsoft.Toolkit.Uwp.Extensions; using Windows.Foundation; using Windows.System; using Windows.UI.Core; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Helpers.cs index 0b722ea0b53..ff7eef3e5f2 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Helpers.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Helpers.cs @@ -9,7 +9,6 @@ using Microsoft.Graphics.Canvas; using Microsoft.Graphics.Canvas.Effects; using Microsoft.Graphics.Canvas.Geometry; -using Microsoft.Toolkit.Uwp.Extensions; using Windows.Foundation; using Windows.Graphics.Imaging; using Windows.Storage.Streams; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Logic.cs index 18718fc8a6d..b702b2cd2d5 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Logic.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Logic.cs @@ -4,7 +4,6 @@ using System; using System.Numerics; -using Microsoft.Toolkit.Uwp.Extensions; using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Hosting; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.cs index 48eecc3ca48..4853b52e09b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; -using Microsoft.Toolkit.Uwp.Extensions; using Windows.Foundation; using Windows.Storage; using Windows.Storage.Streams; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.xaml index 5bbc3165138..616d73620e3 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.xaml @@ -1,7 +1,7 @@  + xmlns:ui="using:Microsoft.Toolkit.Uwp.UI">