Skip to content

Commit 4d8f969

Browse files
h82258652h82258652
authored
Merge branch 'main' into opacitymaskview-experiment
2 parents dafd7fb + d970d3b commit 4d8f969

File tree

10 files changed

+45
-45
lines changed

10 files changed

+45
-45
lines changed

‎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/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/RivePlayer/samples/Dependencies.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@
1212
<!-- WinUI 2 / UWP -->
1313
<ItemGroup Condition="'$(IsUwp)' == 'true'">
1414
<!-- <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.2"/> -->
15-
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230801-preview"/>
15+
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230907"/>
1616
</ItemGroup>
1717

1818
<!-- WinUI 2 / Uno -->
1919
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
2020
<!-- <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.11"/> -->
21-
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230801-preview"/>
21+
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230907"/>
2222
</ItemGroup>
2323

2424
<!-- WinUI 3 / WinAppSdk -->
2525
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
2626
<!-- <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2"/> -->
27-
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230801-preview"/>
27+
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230907"/>
2828
</ItemGroup>
2929

3030
<!-- WinUI 3 / Uno -->
3131
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
3232
<!-- <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.100-dev.15.g12261e2626"/> -->
33-
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230801-preview"/>
33+
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230907"/>
3434
</ItemGroup>
3535
</Project>

‎components/Shimmer/src/Dependencies.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@
1212
<!-- WinUI 2 / UWP -->
1313
<ItemGroup Condition="'$(IsUwp)' == 'true'">
1414
<!-- <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="7.1.3"/> -->
15-
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.0.230801-preview" />
15+
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.0.230907" />
1616
</ItemGroup>
1717

1818
<!-- WinUI 2 / Uno -->
1919
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
2020
<!-- <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI" Version="7.1.11"/> -->
21-
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.0.230801-preview" />
21+
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.0.230907" />
2222
</ItemGroup>
2323

2424
<!-- WinUI 3 / WinAppSdk -->
2525
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
2626
<!-- <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2"/> -->
27-
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.230801-preview" />
27+
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.230907" />
2828
</ItemGroup>
2929

3030
<!-- WinUI 3 / Uno -->
3131
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
3232
<!-- <PackageReference Include="Uno.CommunityToolkit.WinUI.UI" Version="7.1.100"/> -->
33-
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.230801-preview" />
33+
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.230907" />
3434
</ItemGroup>
3535
</Project>

‎components/TokenView/src/Dependencies.props‎

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

1818
<!-- WinUI 2 / Uno -->
1919
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
20-
<PackageReference Include="CommunityToolkit.Uwp.Extensions" Version="8.0.230801-preview"/>
21-
<PackageReference Include="CommunityToolkit.Uwp.Controls.Primitives" Version="8.0.230801-preview"/>
20+
<PackageReference Include="CommunityToolkit.Uwp.Extensions" Version="8.0.230907"/>
21+
<PackageReference Include="CommunityToolkit.Uwp.Controls.Primitives" Version="8.0.230907"/>
2222
</ItemGroup>
2323

2424
<!-- WinUI 3 / WinAppSdk -->
2525
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
26-
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.230801-preview"/>
27-
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.230801-preview"/>
26+
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.230907"/>
27+
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.230907"/>
2828
</ItemGroup>
2929

3030
<!-- WinUI 3 / Uno -->
3131
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
32-
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.230801-preview"/>
33-
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.230801-preview"/>
32+
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.230907"/>
33+
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.230907"/>
3434
</ItemGroup>
3535
</Project>

‎components/TransitionHelper/samples/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.Behaviors" Version="8.0.230801-preview"/>
14+
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230907"/>
1515
</ItemGroup>
1616

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

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

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

‎components/TransitionHelper/src/Dependencies.props‎

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

1818
<!-- WinUI 2 / Uno -->
1919
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
20-
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230801-preview"/>
21-
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.0.230801-preview"/>
20+
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230907"/>
21+
<PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.0.230907"/>
2222
</ItemGroup>
2323

2424
<!-- WinUI 3 / WinAppSdk -->
2525
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
26-
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230801-preview"/>
27-
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.230801-preview"/>
26+
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230907"/>
27+
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.230907"/>
2828
</ItemGroup>
2929

3030
<!-- WinUI 3 / Uno -->
3131
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
32-
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230801-preview"/>
33-
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.230801-preview"/>
32+
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230907"/>
33+
<PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.230907"/>
3434
</ItemGroup>
3535
</Project>

‎tooling‎

0 commit comments

Comments
 (0)