Setup to add back usage of the Extensions in tests via source package…

… helper (test) Add back some of the removed tests to the test project for extensions Adds nuget.config
CommunityToolkit · Apr 5, 2023 · 78a440c · 78a440c
1 parent 1345a23
commit 78a440c
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 10 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,6 +4,7 @@
     <RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
     <ToolingDirectory>$(RepositoryDirectory)\tooling</ToolingDirectory>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <ToolkitExtensionSourceProject>$(RepositoryDirectory)\components\Extensions\src\CommunityToolkit.WinUI.Extensions.csproj</ToolkitExtensionSourceProject>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

diff --git 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
@@ -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
@@ -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<object>();
+        var taskSource = new TaskCompletionSource<object?>();
         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<object>();
+        var taskSource = new TaskCompletionSource<object?>();
         await App.DispatcherQueue.EnqueueAsync(
             async () =>
             {

diff --git 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
@@ -9,6 +9,18 @@
     <Import_RootNamespace>ExtensionsExperiment.Tests</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)BitmapIconExtensionTestPage.xaml.cs">
+      <DependentUpon>BitmapIconExtensionTestPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)BitmapIconExtensionTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)DispatcherQueueExtensionTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)DispatcherQueueTimerExtensionTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\ObjectWithNullableBoolProperty.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Page Include="$(MSBuildThisFileDirectory)BitmapIconExtensionTestPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
 </Project>
diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,10 @@
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="MainLatest" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-MainLatest/nuget/v3/index.json" protocolVersion="3" />
+  </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
+</configuration>
diff --git a/tooling b/tooling
+3 −3		.github/workflows/build.yml
+0 −0		.github/workflows/config/Directory.Build.props
+0 −0		.github/workflows/config/Directory.Build.targets
+10 −0		.github/workflows/config/nuget.config
+22 −0		.github/workflows/config/tooling_config.md
+0 −1		CommunityToolkit.Tests.Shared/CommunityToolkit.Tests.Shared.projitems
+0 −156		CommunityToolkit.Tests.Shared/Internal/DispatcherQueueExtensions.cs
+1 −0		CommunityToolkit.Tests.Shared/VisualUITestBase.cs
+3 −2		ProjectHeads/Tests.Head.Uwp.props
+3 −2		ProjectHeads/Tests.Head.WinAppSdk.props
+13 −0		ProjectHeads/Tests.Head.props
+7 −4		ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs