Re-add back Extensions Dependency to Tests via new NuGet packages in MainLatest feed

michael-hawker · michael-hawker · commit 7318ba4974bb · 2023-04-12T13:21:33.000-07:00
Provides switch to source via ToolkitExtensionSourceProject property
Otherwise uses CommunityToolkit.Uwp/WinUI.Extensions 8.0.0-beta.1 package
Keeps CompositionTargetHelper for now
Cleans up how build config gets copied with a folder
Adds nuget.config
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -116,7 +116,7 @@ jobs:
       - name: Copy props files to root
         shell: pwsh
         working-directory: ./
-        run: copy ./tooling/.github/workflows/Directory.Build.* ./
+        run: copy ./tooling/.github/workflows/config/* ./
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.3.1
@@ -162,7 +162,7 @@ jobs:
         shell: pwsh
         working-directory: ./
         run: |
-          copy ./tooling/.github/workflows/Directory.Build.* ./
+          copy ./tooling/.github/workflows/config/* ./
           mkdir ./.config
           copy ./tooling/.config/dotnet-tools.json ./.config/dotnet-tools.json
           mkdir ./components
@@ -247,7 +247,7 @@ jobs:
         shell: pwsh
         working-directory: ./
         run: |
-          copy ./tooling/.github/workflows/Directory.Build.* ./
+          copy ./tooling/.github/workflows/config/* ./
           mkdir ./.config
           copy ./tooling/.config/dotnet-tools.json ./.config/dotnet-tools.json
           mkdir ./components
diff --git a/.github/workflows/config/Directory.Build.props b/.github/workflows/config/Directory.Build.props
diff --git a/.github/workflows/config/Directory.Build.targets b/.github/workflows/config/Directory.Build.targets
diff --git a/.github/workflows/config/nuget.config b/.github/workflows/config/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/.github/workflows/config/tooling_config.md b/.github/workflows/config/tooling_config.md
@@ -0,0 +1,22 @@
+
+# Tooling Config Folder
+
+This folder contains the minimum configuration required by the tooling module to be built and needs to be in the root of a repository using it.
+
+These files are contained here in the `config` folder to be copied by the tooling `build.yml` file for self-validation within the tooling module CI pipeline.
+
+They can also be used as a starting point for a custom repository that uses the `tooling` sub-module.
+
+## Components
+
+### Directory.Build.props
+
+Contains properties like `RepositoryDirectory` and `ToolingDirectory` which are used within the property files of the tooling module to understand the proper path setup for dependencies and references.
+
+### Directory.Build.targets
+
+Contains `SlnGenSolutionItem` items that we wish to appear within the generated solution files.
+
+### nuget.config
+
+Contains any NuGet feeds required for dependent packages not found on NuGet.org at the moment (for instance the current unified port of the Community Toolkit Extensions used by testing).
diff --git a/CommunityToolkit.Tests.Shared/CommunityToolkit.Tests.Shared.projitems b/CommunityToolkit.Tests.Shared/CommunityToolkit.Tests.Shared.projitems
@@ -19,7 +19,6 @@
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Internal\CompositionTargetHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Internal\DispatcherQueueExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Log.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)VisualUITestBase.cs" />
   </ItemGroup>
diff --git a/CommunityToolkit.Tests.Shared/Internal/DispatcherQueueExtensions.cs b/CommunityToolkit.Tests.Shared/Internal/DispatcherQueueExtensions.cs
diff --git a/CommunityToolkit.Tests.Shared/VisualUITestBase.cs b/CommunityToolkit.Tests.Shared/VisualUITestBase.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.Tests.Internal;
+using CommunityToolkit.WinUI;
 
 namespace CommunityToolkit.Tests;
 
diff --git a/ProjectHeads/Tests.Head.Uwp.props b/ProjectHeads/Tests.Head.Uwp.props
@@ -1,4 +1,7 @@
 <Project>
+  <PropertyGroup>
+    <DependencyVariant>Uwp</DependencyVariant>
+  </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)\Tests.Head.props"/>
   <Import Project="$(MSBuildThisFileDirectory)\Head.Uwp.props" />
   
@@ -9,7 +12,5 @@
 
   <ItemGroup>
     <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
-    <!-- TODO: We need a way to toggle this between Package and Source of the Extension module if we want to set it up 'globally' -->
-    <!--<PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="7.1.2"/>-->
   </ItemGroup>
 </Project>
diff --git a/ProjectHeads/Tests.Head.WinAppSdk.props b/ProjectHeads/Tests.Head.WinAppSdk.props
@@ -1,4 +1,7 @@
 <Project>
+  <PropertyGroup>
+    <DependencyVariant>WinUI</DependencyVariant>
+  </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)\Tests.Head.props"/>
   <Import Project="$(MSBuildThisFileDirectory)\Head.WinAppSdk.props"/>
 
@@ -7,8 +10,6 @@
       <Version>17.1.0</Version>
       <ExcludeAssets>build</ExcludeAssets>
     </PackageReference>
-    <!-- TODO: See comment in LINK:Tests.Head.Uwp.props file -->
-    <!-- <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2"/> -->
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ProjectHeads/Tests.Head.props b/ProjectHeads/Tests.Head.props
@@ -19,6 +19,19 @@
                       OutputItemType="Analyzer" ReferenceOutputAssembly="True" />
   </ItemGroup>
 
+  <Choose>
+    <When Condition="'$(ToolkitExtensionSourceProject)' == ''">
+      <ItemGroup>
+        <PackageReference Include="CommunityToolkit.$(DependencyVariant).Extensions" Version="8.0.0-beta.1"/>
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <ProjectReference Include="$(ToolkitExtensionSourceProject)"/>
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+
   <!-- Global Usings -->
   <ItemGroup>
     <Compile Include="$(ToolingDirectory)\GlobalUsings_WinUI.cs" />
diff --git a/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs b/ProjectTemplate/tests/ExampleProjectTemplateTestClass.cs
@@ -4,6 +4,8 @@
 
 using CommunityToolkit.Tooling.TestGen;
 using CommunityToolkit.Tests;
+using CommunityToolkit.Tests.Internal; // TODO: For CompositionTargetHelper until ported over into package.
+using CommunityToolkit.WinUI;
 using CommunityToolkit.WinUI.Controls;
 
 namespace ProjectTemplateExperiment.Tests;
@@ -57,26 +59,27 @@ public void SimpleUIAttributeExampleTest()
     public void SimpleUIExamplePageTest(ExampleProjectTemplateTestPage page)
     {
         // You can use the Toolkit Visual Tree helpers here to find the component by type or name:
-        /*var component = page.FindDescendant<ProjectTemplate_ClassicBinding>();
+        var component = page.FindDescendant<ProjectTemplate_ClassicBinding>();
 
         Assert.IsNotNull(component);
 
         var componentByName = page.FindDescendant("ProjectTemplateControl");
 
-        Assert.IsNotNull(componentByName);*/
+        Assert.IsNotNull(componentByName);
     }
 
     // You can still do async work with a UIThreadTestMethod as well.
-    /*[UIThreadTestMethod]
+    [UIThreadTestMethod]
     public async Task SimpleAsyncUIExamplePageTest(ExampleProjectTemplateTestPage page)
     {
         // This helper can be used to wait for a rendering pass to complete.
+        // Note, this is already done by loading a Page with the [UIThreadTestMethod] helper.
         await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
 
         var component = page.FindDescendant<ProjectTemplate_ClassicBinding>();
 
         Assert.IsNotNull(component);
-    }*/
+    }
 
     //// ----------------------------- ADVANCED TEST SCENARIOS -----------------------------
 
