Skip to content

Commit c4d5b38

Browse files
niels9001niels9001
authored
Merge branch 'main' into niels9001/titlebar-experiment
2 parents 91a032c + ecf8343 commit c4d5b38

File tree

92 files changed

+4575
-50
lines changed

Some content is hidden

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

92 files changed

+4575
-50
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"uno.check": {
6-
"version": "1.16.1",
6+
"version": "1.18.1",
77
"commands": [
88
"uno-check"
99
]

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ jobs:
106106
- name: Restore dotnet tools
107107
run: dotnet tool restore
108108

109+
# Pinning Manifest for 1.18 version of Uno.Check at the moment to unblock build, see https://github.com/CommunityToolkit/Windows/pull/320
109110
- name: Run Uno Check to Install Dependencies
110111
run: >
111112
dotnet tool run uno-check
@@ -116,6 +117,7 @@ jobs:
116117
--skip androidemulator
117118
--skip vswinworkloads
118119
--verbose
120+
--manifest https://raw.githubusercontent.com/unoplatform/uno.check/1660eba219684491362704c75153b40ce6ef7a35/manifests/uno.ui.manifest.json
119121
120122
- name: Add msbuild to PATH
121123
uses: microsoft/[email protected]

‎components/CanvasLayout/samples/Assets/CanvasLayout.png‎

-1.66 KB
Loading

‎components/CanvasView/samples/Assets/CanvasView.png‎

-1.66 KB
Loading

‎components/CanvasView/src/Dependencies.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
<Project>
1212
<!-- WinUI 2 / UWP -->
1313
<ItemGroup Condition="'$(IsUwp)' == 'true'">
14-
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230801-preview"/>
14+
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230907"/>
1515
</ItemGroup>
1616

1717
<!-- WinUI 2 / Uno -->
1818
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
19-
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230801-preview"/>
19+
<PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230907"/>
2020
</ItemGroup>
2121

2222
<!-- WinUI 3 / WinAppSdk -->
2323
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
24-
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230801-preview"/>
24+
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230907"/>
2525
</ItemGroup>
2626

2727
<!-- WinUI 3 / Uno -->
2828
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
29-
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230801-preview"/>
29+
<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230907"/>
3030
</ItemGroup>
3131
</Project>

‎components/DataTable/samples/Assets/DataTable.png‎

-1.66 KB
Loading

‎components/DataTable/samples/Dependencies.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
<Project>
1212
<!-- WinUI 2 / UWP / Uno -->
1313
<ItemGroup Condition="'$(IsUwp)' == 'true' OR ('$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2')">
14-
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230801-preview"/>
15-
<PackageReference Include="CommunityToolkit.Uwp.Controls.HeaderedControls" Version="8.0.230801-preview"/>
14+
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230907"/>
15+
<PackageReference Include="CommunityToolkit.Uwp.Controls.HeaderedControls" Version="8.0.230907"/>
1616
</ItemGroup>
1717

1818
<!-- WinUI 3 / WinAppSdk / Uno -->
1919
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true' OR ('$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3')">
20-
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230801-preview"/>
21-
<PackageReference Include="CommunityToolkit.WinUI.Controls.HeaderedControls" Version="8.0.230801-preview"/>
20+
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230907"/>
21+
<PackageReference Include="CommunityToolkit.WinUI.Controls.HeaderedControls" Version="8.0.230907"/>
2222
</ItemGroup>
2323

2424
<!-- WinUI 2 / UWP -->

‎components/DataTable/src/DataTable/DataColumn.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
1+
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
@@ -38,11 +38,11 @@
3838
Width="8"
3939
MinWidth="4"
4040
Margin="0"
41+
Padding="0"
4142
Background="Transparent"
4243
Foreground="{ThemeResource ControlStrokeColorSecondaryBrush}"
4344
Visibility="{Binding CanResize, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource DataColumnBoolToVisibilityConverter}}">
4445
<controls:ContentSizer.Resources>
45-
<Thickness x:Key="SizerBaseThumbMargin">0</Thickness>
4646
<x:Double x:Key="SizerBaseThumbWidth">2</x:Double>
4747
<x:Double x:Key="SizerBaseThumbHeight">16</x:Double>
4848
</controls:ContentSizer.Resources>

‎components/DataTable/src/Dependencies.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414

1515
<!-- WinUI 2 / UWP / Uno -->
1616
<ItemGroup Condition="'$(IsUwp)' == 'true' OR ('$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2')">
17-
<PackageReference Include="CommunityToolkit.Uwp.Converters" Version="8.0.230801-preview"/>
18-
<PackageReference Include="CommunityToolkit.Uwp.Extensions" Version="8.0.230801-preview"/>
19-
<PackageReference Include="CommunityToolkit.Uwp.Controls.Sizers" Version="8.0.230801-preview"/>
17+
<PackageReference Include="CommunityToolkit.Uwp.Converters" Version="8.0.230907"/>
18+
<PackageReference Include="CommunityToolkit.Uwp.Extensions" Version="8.0.230907"/>
19+
<PackageReference Include="CommunityToolkit.Uwp.Controls.Sizers" Version="8.0.230907"/>
2020
</ItemGroup>
2121

2222
<!-- WinUI 3 / WinAppSdk / Uno -->
2323
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true' OR ('$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3')">
24-
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.0.230801-preview"/>
25-
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.230801-preview"/>
26-
<PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.230801-preview"/>
24+
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.0.230907"/>
25+
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.230907"/>
26+
<PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.230907"/>
2727
</ItemGroup>
2828
</Project>

‎components/MarkdownTextBlock/OpenSolution.bat‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@ECHO OFF
2+
3+
powershell ..\..\tooling\ProjectHeads\GenerateSingleSampleHeads.ps1 -componentPath %CD% %*

0 commit comments

Comments
 (0)