Skip to content

Commit 54d9881

Browse files
authored
Merge branch 'main' into niels9001/colorpicker
2 parents 5a48acf + e9fbde7 commit 54d9881

File tree

60 files changed

+141
-852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+141
-852
lines changed

.config/dotnet-tools.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"uno.check": {
6-
"version": "1.18.1",
6+
"version": "1.20.2",
77
"commands": [
88
"uno-check"
99
]
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.visualstudio.slngen.tool": {
18-
"version": "9.5.4",
18+
"version": "11.2.3",
1919
"commands": [
2020
"slngen"
2121
]

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"args": {
88
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0
99
// Append -bullseye or -focal to pin to an OS version.
10-
"VARIANT": "7.0",
10+
"VARIANT": "8.0",
1111
// Options
1212
"NODE_VERSION": "lts/*"
1313
}

.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
merge_group:
1818

1919
env:
20-
DOTNET_VERSION: ${{ '7.0.100' }}
20+
DOTNET_VERSION: ${{ '8.0.201' }}
2121
ENABLE_DIAGNOSTICS: true
2222
MSBUILD_VERBOSITY: normal
2323
#COREHOST_TRACE: 1
@@ -108,7 +108,6 @@ jobs:
108108
- name: Restore dotnet tools
109109
run: dotnet tool restore
110110

111-
# Pinning Manifest for 1.18 version of Uno.Check at the moment to unblock build, see https://github.com/CommunityToolkit/Windows/pull/320
112111
- name: Run Uno Check to Install Dependencies
113112
run: >
114113
dotnet tool run uno-check
@@ -119,10 +118,11 @@ jobs:
119118
--skip androidemulator
120119
--skip vswinworkloads
121120
--verbose
122-
--manifest https://raw.githubusercontent.com/unoplatform/uno.check/1660eba219684491362704c75153b40ce6ef7a35/manifests/uno.ui.manifest.json
123121
124122
- name: Add msbuild to PATH
125-
uses: microsoft/[email protected]
123+
uses: microsoft/setup-msbuild@v2
124+
with:
125+
vs-version: '[17.9,)'
126126

127127
- name: Enable ${{ env.TARGET_PLATFORMS }} TargetFrameworks
128128
working-directory: ./${{ env.MULTI_TARGET_DIRECTORY }}

components/Animations/samples/Animations.Samples.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>Animations</ToolkitComponentName>
46
</PropertyGroup>

components/Animations/src/CommunityToolkit.WinUI.Animations.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>Animations</ToolkitComponentName>
46
<Description>This package contains Animations.</Description>

components/Behaviors/samples/Behaviors.Samples.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>Behaviors</ToolkitComponentName>
46
</PropertyGroup>

components/Behaviors/src/CommunityToolkit.WinUI.Behaviors.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>Behaviors</ToolkitComponentName>
46
<Description>This package contains Behaviors.</Description>

components/Behaviors/tests/Behaviors.Tests.projitems

-8
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,12 @@
99
<Import_RootNamespace>BehaviorsExperiment.Tests</Import_RootNamespace>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<Compile Include="$(MSBuildThisFileDirectory)ExampleBehaviorsTestClass.cs" />
13-
<Compile Include="$(MSBuildThisFileDirectory)ExampleBehaviorsTestPage.xaml.cs">
14-
<DependentUpon>ExampleBehaviorsTestPage.xaml</DependentUpon>
15-
</Compile>
1612
<Compile Include="$(MSBuildThisFileDirectory)StackedNotificationsBehaviorsTestPage.xaml.cs">
1713
<DependentUpon>StackedNotificationsBehaviorsTestPage.xaml</DependentUpon>
1814
</Compile>
1915
<Compile Include="$(MSBuildThisFileDirectory)StackedNotificationsBehaviorTestClass.cs" />
2016
</ItemGroup>
2117
<ItemGroup>
22-
<Page Include="$(MSBuildThisFileDirectory)ExampleBehaviorsTestPage.xaml">
23-
<SubType>Designer</SubType>
24-
<Generator>MSBuild:Compile</Generator>
25-
</Page>
2618
<Page Include="$(MSBuildThisFileDirectory)StackedNotificationsBehaviorsTestPage.xaml">
2719
<SubType>Designer</SubType>
2820
<Generator>MSBuild:Compile</Generator>

components/Behaviors/tests/ExampleBehaviorsTestClass.cs

-41
This file was deleted.

components/Behaviors/tests/ExampleBehaviorsTestPage.xaml

-11
This file was deleted.

components/Behaviors/tests/ExampleBehaviorsTestPage.xaml.cs

-16
This file was deleted.

components/CameraPreview/samples/CameraPreview.Samples.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>CameraPreview</ToolkitComponentName>
46
</PropertyGroup>

components/CameraPreview/src/CommunityToolkit.WinUI.Controls.CameraPreview.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>CameraPreview</ToolkitComponentName>
46
<Description>This package contains CameraPreview.</Description>

components/Collections/samples/Collections.Samples.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>Collections</ToolkitComponentName>
46
</PropertyGroup>

components/Collections/src/CommunityToolkit.WinUI.Collections.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>Collections</ToolkitComponentName>
46
<Description>This package contains the AdvancedCollectionView and IncrementalLoadingCollection.</Description>

components/Converters/samples/Converters.Samples.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>Converters</ToolkitComponentName>
46
</PropertyGroup>

components/Converters/src/CommunityToolkit.WinUI.Converters.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>Converters</ToolkitComponentName>
46
<Description>This package contains Converters.</Description>

components/DeveloperTools/samples/DeveloperTools.Samples.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>DeveloperTools</ToolkitComponentName>
46
</PropertyGroup>

components/DeveloperTools/src/CommunityToolkit.WinUI.DeveloperTools.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>DeveloperTools</ToolkitComponentName>
46
<Description>This package contains DeveloperTools.</Description>

components/Extensions/samples/Extensions.Samples.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>Extensions</ToolkitComponentName>
46
</PropertyGroup>

components/Extensions/src/CommunityToolkit.WinUI.Extensions.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>Extensions</ToolkitComponentName>
46
<Description>This package contains Extensions.</Description>

components/HeaderedControls/samples/HeaderedControls.Samples.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>HeaderedControls</ToolkitComponentName>
46
</PropertyGroup>

components/HeaderedControls/src/CommunityToolkit.WinUI.Controls.HeaderedControls.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
3+
24
<PropertyGroup>
35
<ToolkitComponentName>HeaderedControls</ToolkitComponentName>
46
<Description>This package contains HeaderedControls.</Description>

components/HeaderedControls/tests/HeaderedContentControlTestClass.cs

-82
Original file line numberDiff line numberDiff line change
@@ -10,95 +10,13 @@ namespace HeaderedControls.Tests;
1010
[TestClass]
1111
public partial class HeaderedContentControlTestClass : VisualUITestBase
1212
{
13-
// If you don't need access to UI objects directly or async code, use this pattern.
14-
[TestMethod]
15-
public void SimpleSynchronousExampleTest()
16-
{
17-
var assembly = typeof(HeaderedContentControl).Assembly;
18-
var type = assembly.GetType(typeof(HeaderedContentControl).FullName ?? string.Empty);
19-
20-
Assert.IsNotNull(type, "Could not find HeaderedContentControl type.");
21-
Assert.AreEqual(typeof(HeaderedContentControl), type, "Type of HeaderedContentControl does not match expected type.");
22-
}
23-
2413
// The UIThreadTestMethod can also easily grab a XAML Page for us by passing its type as a parameter.
2514
// This lets us actually test a control as it would behave within an actual application.
2615
// The page will already be loaded by the time your test is called.
2716
[UIThreadTestMethod]
2817
public void SimpleUIExamplePageTest(HeaderedContentControlTestPage page)
2918
{
30-
// You can use the Toolkit Visual Tree helpers here to find the component by type or name:
31-
var component = page.FindDescendant<HeaderedContentControl>();
32-
33-
Assert.IsNotNull(component);
34-
35-
var componentByName = page.FindDescendant("HeaderedContentControl");
36-
37-
Assert.IsNotNull(componentByName);
38-
}
39-
40-
// You can still do async work with a UIThreadTestMethod as well.
41-
[UIThreadTestMethod]
42-
public async Task SimpleAsyncUIExamplePageTest(HeaderedContentControlTestPage page)
43-
{
44-
// This helper can be used to wait for a rendering pass to complete.
45-
await CompositionTargetHelper.ExecuteAfterCompositionRenderingAsync(() => { });
46-
4719
var component = page.FindDescendant<HeaderedContentControl>();
48-
4920
Assert.IsNotNull(component);
5021
}
51-
52-
//// ----------------------------- ADVANCED TEST SCENARIOS -----------------------------
53-
54-
// If you need to use DataRow, you can use this pattern with the UI dispatch still.
55-
// Otherwise, checkout the UIThreadTestMethod attribute above.
56-
// See https://github.com/CommunityToolkit/Labs-Windows/issues/186
57-
[TestMethod]
58-
public async Task ComplexAsyncUIExampleTest()
59-
{
60-
await EnqueueAsync(() =>
61-
{
62-
var component = new HeaderedContentControl();
63-
Assert.IsNotNull(component);
64-
});
65-
}
66-
67-
// If you want to load other content not within a XAML page using the UIThreadTestMethod above.
68-
// Then you can do that using the Load/UnloadTestContentAsync methods.
69-
[TestMethod]
70-
public async Task ComplexAsyncLoadUIExampleTest()
71-
{
72-
await EnqueueAsync(async () =>
73-
{
74-
var component = new HeaderedContentControl();
75-
Assert.IsNotNull(component);
76-
Assert.IsFalse(component.IsLoaded);
77-
78-
await LoadTestContentAsync(component);
79-
80-
Assert.IsTrue(component.IsLoaded);
81-
82-
await UnloadTestContentAsync(component);
83-
84-
Assert.IsFalse(component.IsLoaded);
85-
});
86-
}
87-
88-
// You can still use the UIThreadTestMethod to remove the extra layer for the dispatcher as well:
89-
[UIThreadTestMethod]
90-
public async Task ComplexAsyncLoadUIExampleWithoutDispatcherTest()
91-
{
92-
var component = new HeaderedContentControl();
93-
Assert.IsNotNull(component);
94-
Assert.IsFalse(component.IsLoaded);
95-
96-
await LoadTestContentAsync(component);
97-
98-
Assert.IsTrue(component.IsLoaded);
99-
100-
await UnloadTestContentAsync(component);
101-
102-
Assert.IsFalse(component.IsLoaded);
103-
}
10422
}

0 commit comments

Comments
 (0)