diff --git a/Directory.Build.props b/Directory.Build.props index 7cede6a7..22592686 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,6 +4,7 @@ $(MSBuildThisFileDirectory) $(RepositoryDirectory)\tooling true + $(RepositoryDirectory)\components\Extensions\src\CommunityToolkit.WinUI.Extensions.csproj diff --git a/components/Extensions/tests/BitmapIconExtensionTestPage.xaml b/components/Extensions/tests/BitmapIconExtensionTestPage.xaml index 7fa48d75..00098253 100644 --- a/components/Extensions/tests/BitmapIconExtensionTestPage.xaml +++ b/components/Extensions/tests/BitmapIconExtensionTestPage.xaml @@ -2,8 +2,8 @@ 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:local="using:ExtensionsExperiment.Tests" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:ui="using:CommunityToolkit.WinUI" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" mc:Ignorable="d"> diff --git a/components/Extensions/tests/BitmapIconExtensionTests.cs b/components/Extensions/tests/BitmapIconExtensionTests.cs index ff9320d9..929964d3 100644 --- a/components/Extensions/tests/BitmapIconExtensionTests.cs +++ b/components/Extensions/tests/BitmapIconExtensionTests.cs @@ -4,6 +4,7 @@ using CommunityToolkit.Tests; using CommunityToolkit.Tooling.TestGen; +using CommunityToolkit.WinUI; using ExtensionsExperiment.Tests; namespace ExtensionsComponent.Tests; @@ -15,8 +16,7 @@ public partial class BitmapIconExtensionTests : VisualUITestBase [UIThreadTestMethod] public void BitmapIconExtension_MarkupExtension_ProvideImage(BitmapIconExtensionTestPage page) { - // TODO: Temp until we get a package for this. - var button = CommunityToolkit.WinUI.DependencyObjectExtensions.FindDescendant(page, "ColorButton") as Button; + var button = page.FindDescendant("ColorButton") as Button; Assert.IsNotNull(button, $"Could not find the {nameof(Button)} control in tree."); @@ -37,7 +37,7 @@ public void BitmapIconExtension_MarkupExtension_ProvideImage(BitmapIconExtension public void BitmapIconExtension_MarkupExtension_ProvideImageAsMonochrome(BitmapIconExtensionTestPage page) { // TODO: Temp until we get a package for this. - var button = CommunityToolkit.WinUI.DependencyObjectExtensions.FindDescendant(page, "MonochromeButton") as Button; + var button = page.FindDescendant("MonochromeButton") as Button; Assert.IsNotNull(button, $"Could not find the {nameof(Button)} control in tree."); diff --git a/components/Extensions/tests/DispatcherQueueExtensionTests.cs b/components/Extensions/tests/DispatcherQueueExtensionTests.cs index 4186402c..4e52bd33 100644 --- a/components/Extensions/tests/DispatcherQueueExtensionTests.cs +++ b/components/Extensions/tests/DispatcherQueueExtensionTests.cs @@ -2,9 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if WINAPPSDK using CommunityToolkit.Tests; -using CommunityToolkit.Tooling.TestGen; +using CommunityToolkit.WinUI; + +#if WINAPPSDK using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue; using DispatcherQueuePriority = Microsoft.UI.Dispatching.DispatcherQueuePriority; #else @@ -48,7 +49,7 @@ public void Test_DispatcherQueueHelper_Action_Ok_UIThread() [TestMethod] public async Task Test_DispatcherQueueHelper_Action_Ok_NonUIThread() { - var taskSource = new TaskCompletionSource(); + var taskSource = new TaskCompletionSource(); await App.DispatcherQueue.EnqueueAsync( async () => { @@ -118,7 +119,7 @@ public void Test_DispatcherQueueHelper_FuncOfT_Ok_UIThread() [TestMethod] public async Task Test_DispatcherQueueHelper_FuncOfT_Ok_NonUIThread() { - var taskSource = new TaskCompletionSource(); + var taskSource = new TaskCompletionSource(); await App.DispatcherQueue.EnqueueAsync( async () => { diff --git a/components/Extensions/tests/DispatcherQueueTimerExtensionTests.cs b/components/Extensions/tests/DispatcherQueueTimerExtensionTests.cs index 5ad8602c..70962954 100644 --- a/components/Extensions/tests/DispatcherQueueTimerExtensionTests.cs +++ b/components/Extensions/tests/DispatcherQueueTimerExtensionTests.cs @@ -2,9 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if WINAPPSDK using CommunityToolkit.Tests; using CommunityToolkit.Tooling.TestGen; +using CommunityToolkit.WinUI; + +#if WINAPPSDK using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue; using DispatcherQueuePriority = Microsoft.UI.Dispatching.DispatcherQueuePriority; using DispatcherQueueTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer; diff --git a/components/Extensions/tests/Extensions.Tests.projitems b/components/Extensions/tests/Extensions.Tests.projitems index af3cb6bf..9c300eab 100644 --- a/components/Extensions/tests/Extensions.Tests.projitems +++ b/components/Extensions/tests/Extensions.Tests.projitems @@ -9,6 +9,18 @@ ExtensionsExperiment.Tests + + BitmapIconExtensionTestPage.xaml + + + + + + + Designer + MSBuild:Compile + + \ No newline at end of file diff --git a/nuget.config b/nuget.config new file mode 100644 index 00000000..c3f797ff --- /dev/null +++ b/nuget.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/tooling b/tooling index be8bf3ca..b95ab2e0 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit be8bf3ca1fe4b25f5ae936bf53b3a48b8865ee40 +Subproject commit b95ab2e0e1fa3a705c2f51e780dc1b6b6365e5d9