Merge branch 'main' into niels9001/colorpicker

CommunityToolkit · Feb 28, 2024 · 54d9881 · 54d9881
2 parents 5a48acf + e9fbde7
commit 54d9881
Show file tree

Hide file tree

Showing 60 changed files with 141 additions and 852 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "uno.check": {
-      "version": "1.18.1",
+      "version": "1.20.2",
       "commands": [
         "uno-check"
       ]
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.visualstudio.slngen.tool": {
-      "version": "9.5.4",
+      "version": "11.2.3",
       "commands": [
         "slngen"
       ]

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -7,7 +7,7 @@
 		"args": {
 			// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0
 			// Append -bullseye or -focal to pin to an OS version.
-			"VARIANT": "7.0",
+			"VARIANT": "8.0",
 			// Options
 			"NODE_VERSION": "lts/*"
 		}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ on:
   merge_group:
 
 env:
-  DOTNET_VERSION: ${{ '7.0.100' }}
+  DOTNET_VERSION: ${{ '8.0.201' }}
   ENABLE_DIAGNOSTICS: true
   MSBUILD_VERBOSITY: normal
   #COREHOST_TRACE: 1
@@ -108,7 +108,6 @@ jobs:
       - name: Restore dotnet tools
         run: dotnet tool restore
 
-      # Pinning Manifest for 1.18 version of Uno.Check at the moment to unblock build, see https://github.com/CommunityToolkit/Windows/pull/320
       - name: Run Uno Check to Install Dependencies
         run: >
           dotnet tool run uno-check 
@@ -119,10 +118,11 @@ jobs:
           --skip androidemulator
           --skip vswinworkloads
           --verbose
-          --manifest https://raw.githubusercontent.com/unoplatform/uno.check/1660eba219684491362704c75153b40ce6ef7a35/manifests/uno.ui.manifest.json
 
       - name: Add msbuild to PATH
-        uses: microsoft/[email protected]
+        uses: microsoft/setup-msbuild@v2
+        with:
+          vs-version: '[17.9,)'
 
       - name: Enable ${{ env.TARGET_PLATFORMS }} TargetFrameworks
         working-directory: ./${{ env.MULTI_TARGET_DIRECTORY }}

diff --git a/components/Animations/samples/Animations.Samples.csproj b/components/Animations/samples/Animations.Samples.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>Animations</ToolkitComponentName>
   </PropertyGroup>

diff --git a/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj b/components/Animations/src/CommunityToolkit.WinUI.Animations.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>Animations</ToolkitComponentName>
     <Description>This package contains Animations.</Description>

diff --git a/components/Behaviors/samples/Behaviors.Samples.csproj b/components/Behaviors/samples/Behaviors.Samples.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>Behaviors</ToolkitComponentName>
   </PropertyGroup>

diff --git a/components/Behaviors/src/CommunityToolkit.WinUI.Behaviors.csproj b/components/Behaviors/src/CommunityToolkit.WinUI.Behaviors.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>Behaviors</ToolkitComponentName>
     <Description>This package contains Behaviors.</Description>

diff --git a/components/Behaviors/tests/Behaviors.Tests.projitems b/components/Behaviors/tests/Behaviors.Tests.projitems
@@ -9,20 +9,12 @@
     <Import_RootNamespace>BehaviorsExperiment.Tests</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleBehaviorsTestClass.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleBehaviorsTestPage.xaml.cs">
-      <DependentUpon>ExampleBehaviorsTestPage.xaml</DependentUpon>
-    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)StackedNotificationsBehaviorsTestPage.xaml.cs">
       <DependentUpon>StackedNotificationsBehaviorsTestPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)StackedNotificationsBehaviorTestClass.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleBehaviorsTestPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)StackedNotificationsBehaviorsTestPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/components/Behaviors/tests/ExampleBehaviorsTestClass.cs b/components/Behaviors/tests/ExampleBehaviorsTestClass.cs
diff --git a/components/Behaviors/tests/ExampleBehaviorsTestPage.xaml b/components/Behaviors/tests/ExampleBehaviorsTestPage.xaml
diff --git a/components/Behaviors/tests/ExampleBehaviorsTestPage.xaml.cs b/components/Behaviors/tests/ExampleBehaviorsTestPage.xaml.cs
diff --git a/components/CameraPreview/samples/CameraPreview.Samples.csproj b/components/CameraPreview/samples/CameraPreview.Samples.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>CameraPreview</ToolkitComponentName>
   </PropertyGroup>

diff --git a/components/CameraPreview/src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj b/components/CameraPreview/src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>CameraPreview</ToolkitComponentName>
     <Description>This package contains CameraPreview.</Description>

diff --git a/components/Collections/samples/Collections.Samples.csproj b/components/Collections/samples/Collections.Samples.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>Collections</ToolkitComponentName>
   </PropertyGroup>

diff --git a/components/Collections/src/CommunityToolkit.WinUI.Collections.csproj b/components/Collections/src/CommunityToolkit.WinUI.Collections.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>Collections</ToolkitComponentName>
     <Description>This package contains the AdvancedCollectionView and IncrementalLoadingCollection.</Description>

diff --git a/components/Converters/samples/Converters.Samples.csproj b/components/Converters/samples/Converters.Samples.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>Converters</ToolkitComponentName>
   </PropertyGroup>

diff --git a/components/Converters/src/CommunityToolkit.WinUI.Converters.csproj b/components/Converters/src/CommunityToolkit.WinUI.Converters.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>Converters</ToolkitComponentName>
     <Description>This package contains Converters.</Description>

diff --git a/components/DeveloperTools/samples/DeveloperTools.Samples.csproj b/components/DeveloperTools/samples/DeveloperTools.Samples.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>DeveloperTools</ToolkitComponentName>
   </PropertyGroup>

diff --git a/components/DeveloperTools/src/CommunityToolkit.WinUI.DeveloperTools.csproj b/components/DeveloperTools/src/CommunityToolkit.WinUI.DeveloperTools.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>DeveloperTools</ToolkitComponentName>
     <Description>This package contains DeveloperTools.</Description>

diff --git a/components/Extensions/samples/Extensions.Samples.csproj b/components/Extensions/samples/Extensions.Samples.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>Extensions</ToolkitComponentName>
   </PropertyGroup>

diff --git a/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj b/components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>Extensions</ToolkitComponentName>
     <Description>This package contains Extensions.</Description>

diff --git a/components/HeaderedControls/samples/HeaderedControls.Samples.csproj b/components/HeaderedControls/samples/HeaderedControls.Samples.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>HeaderedControls</ToolkitComponentName>
   </PropertyGroup>

diff --git a/components/HeaderedControls/src/CommunityToolkit.WinUI.Controls.HeaderedControls.csproj b/components/HeaderedControls/src/CommunityToolkit.WinUI.Controls.HeaderedControls.csproj
@@ -1,4 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
+
   <PropertyGroup>
     <ToolkitComponentName>HeaderedControls</ToolkitComponentName>
     <Description>This package contains HeaderedControls.</Description>

diff --git a/components/HeaderedControls/tests/HeaderedContentControlTestClass.cs b/components/HeaderedControls/tests/HeaderedContentControlTestClass.cs
@@ -10,95 +10,13 @@ namespace HeaderedControls.Tests;
 [TestClass]
 public partial class HeaderedContentControlTestClass : VisualUITestBase
 {
-    // If you don't need access to UI objects directly or async code, use this pattern.
-    [TestMethod]
-    public void SimpleSynchronousExampleTest()
-    {
-        var assembly = typeof(HeaderedContentControl).Assembly;
-        var type = assembly.GetType(typeof(HeaderedContentControl).FullName ?? string.Empty);
-
-        Assert.IsNotNull(type, "Could not find HeaderedContentControl type.");
-        Assert.AreEqual(typeof(HeaderedContentControl), type, "Type of HeaderedContentControl does not match expected type.");
-    }
-
     // The UIThreadTestMethod can also easily grab a XAML Page for us by passing its type as a parameter.
     // This lets us actually test a control as it would behave within an actual application.
     // The page will already be loaded by the time your test is called.
     [UIThreadTestMethod]
     public void SimpleUIExamplePageTest(HeaderedContentControlTestPage page)
     {
-        // You can use the Toolkit Visual Tree helpers here to find the component by type or name:
-        var component = page.FindDescendant<HeaderedContentControl>();
-
-        Assert.IsNotNull(component);
-
-        var componentByName = page.FindDescendant("HeaderedContentControl");
-
-        Assert.IsNotNull(componentByName);
-    }
-
-    // You can still do async work with a UIThreadTestMethod as well.
-    [UIThreadTestMethod]
-    public async Task SimpleAsyncUIExamplePageTest(HeaderedContentControlTestPage page)
-    {
-        // This helper can be used to wait for a rendering pass to complete.
-        await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
-
         var component = page.FindDescendant<HeaderedContentControl>();
-
         Assert.IsNotNull(component);
     }
-
-    //// ----------------------------- ADVANCED TEST SCENARIOS -----------------------------
-
-    // If you need to use DataRow, you can use this pattern with the UI dispatch still.
-    // Otherwise, checkout the UIThreadTestMethod attribute above.
-    // See https://github.com/CommunityToolkit/Labs-Windows/issues/186
-    [TestMethod]
-    public async Task ComplexAsyncUIExampleTest()
-    {
-        await EnqueueAsync(() =>
-        {
-            var component = new HeaderedContentControl();
-            Assert.IsNotNull(component);
-        });
-    }
-
-    // If you want to load other content not within a XAML page using the UIThreadTestMethod above.
-    // Then you can do that using the Load/UnloadTestContentAsync methods.
-    [TestMethod]
-    public async Task ComplexAsyncLoadUIExampleTest()
-    {
-        await EnqueueAsync(async () =>
-        {
-            var component = new HeaderedContentControl();
-            Assert.IsNotNull(component);
-            Assert.IsFalse(component.IsLoaded);
-
-            await LoadTestContentAsync(component);
-
-            Assert.IsTrue(component.IsLoaded);
-
-            await UnloadTestContentAsync(component);
-
-            Assert.IsFalse(component.IsLoaded);
-        });
-    }
-
-    // You can still use the UIThreadTestMethod to remove the extra layer for the dispatcher as well:
-    [UIThreadTestMethod]
-    public async Task ComplexAsyncLoadUIExampleWithoutDispatcherTest()
-    {
-        var component = new HeaderedContentControl();
-        Assert.IsNotNull(component);
-        Assert.IsFalse(component.IsLoaded);
-
-        await LoadTestContentAsync(component);
-
-        Assert.IsTrue(component.IsLoaded);
-
-        await UnloadTestContentAsync(component);
-
-        Assert.IsFalse(component.IsLoaded);
-    }
 }