Skip to content

Commit 8ecc496

Browse files
Merge pull request #4092 from RosarioPulella/winui-2.6
Update all relevant WinUI 2.5 revs to 2.6
2 parents 9444484 + 9ceabc1 commit 8ecc496

File tree

10 files changed

+16
-15
lines changed

10 files changed

+16
-15
lines changed

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
</PackageReference>
112112
-->
113113
<PackageReference Include="Microsoft.UI.Xaml">
114-
<Version>2.5.0</Version>
114+
<Version>2.6.1</Version>
115115
</PackageReference>
116116
<PackageReference Include="Monaco.Editor">
117117
<Version>0.7.0-alpha</Version>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TileControl/TileControl.bind

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
ImageSource="ms-appx:///SamplePages/TileControl/Animations.png"
6262
ParallaxSpeedRatio="@[Parallax Speed Ratio:DoubleSlider:1.2:1-3]"
6363
ScrollViewerContainer="{Binding ElementName=FlipView, Mode=OneTime}">
64-
<FlipView x:Name="FlipView">
64+
<FlipView x:Name="FlipView" Background="Transparent">
6565

6666
<Border Style="{StaticResource BorderStyle}">
6767
<TextBlock Style="{StaticResource TextBlockStyle}" Text="Parallax with FlipView &gt;"/>

Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
MenuItemTemplate="{StaticResource CategoryTemplate}"
3535
PaneDisplayMode="Top"
3636
SelectionFollowsFocus="Disabled">
37+
<winui:NavigationView.Resources>
38+
<CornerRadius x:Key="NavigationViewContentGridCornerRadius">0,0,0,0</CornerRadius>
39+
</winui:NavigationView.Resources>
3740
<winui:NavigationView.AutoSuggestBox>
3841
<AutoSuggestBox x:Name="SearchBox"
3942
MinWidth="150"

Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<Setter Property="Visibility" Value="Visible" />
1515
<Setter Property="Background" Value="Transparent" />
1616
<Setter Property="BorderThickness" Value="0" />
17+
<Setter Property="Padding" Value="8,5,8,6" />
1718
</Style>
1819

1920
<Style x:Key="TokenizingTextBoxItemTokenStyle" TargetType="controls:TokenizingTextBoxItem">

Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
9090
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
9191
<Setter Property="TitleBarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
92-
<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundAltHighBrush}" />
92+
<Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
9393
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
9494
<Setter Property="TabNavigation" Value="Local" />
9595
<Setter Property="IsHoldingEnabled" Value="True" />
@@ -99,7 +99,7 @@
9999
<Setter Property="Margin" Value="0" />
100100
<Setter Property="MinWidth" Value="{ThemeResource GridViewItemMinWidth}" />
101101
<Setter Property="MinHeight" Value="{ThemeResource GridViewItemMinHeight}" />
102-
<Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundChromeHighBrush}" />
102+
<Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
103103
<Setter Property="BorderThickness" Value="1" />
104104
<Setter Property="IsTabStop" Value="False" />
105105
<Setter Property="IsExpanded" Value="True"/>
@@ -156,8 +156,7 @@
156156
Background="{TemplateBinding CloseButtonBackground}"
157157
Style="{StaticResource ButtonRevealStyle}"
158158
BorderThickness="1"
159-
Width="32"
160-
Height="32"
159+
VerticalAlignment="Stretch"
161160
Content="&#xE73F;"
162161
FontFamily="Segoe MDL2 Assets"
163162
FontSize="14"
@@ -169,8 +168,7 @@
169168
Background="{TemplateBinding CloseButtonBackground}"
170169
Style="{StaticResource ButtonRevealStyle}"
171170
BorderThickness="1"
172-
Width="32"
173-
Height="32"
171+
VerticalAlignment="Stretch"
174172
Content="&#xE711;"
175173
FontFamily="Segoe MDL2 Assets"
176174
FontSize="14"

Microsoft.Toolkit.Uwp.UI.Controls.Layout/Expander/Expander.xaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111

1212
<Style x:Key="HeaderToggleButtonStyle"
1313
TargetType="ToggleButton">
14-
<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
15-
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
16-
<Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundTransparentBrush}" />
14+
<Setter Property="Background" Value="{ThemeResource ExpanderHeaderBackground}" />
15+
<Setter Property="BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
1716
<Setter Property="BorderThickness" Value="0" />
1817
<Setter Property="Padding" Value="2,0,0,0" />
1918
<Setter Property="Height" Value="40" />

SmokeTests/SmokeTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<!-- Only the Layout package have a dependency on WinUI -->
112112
<ItemGroup Condition="$(CurrentProject) == 'UWPBaselineWinUI' or $(CurrentProject) == 'Microsoft.Toolkit.Uwp.UI.Controls.Layout'">
113113
<PackageReference Include="Microsoft.UI.Xaml">
114-
<Version>2.5.0</Version>
114+
<Version>2.6.1</Version>
115115
</PackageReference>
116116
</ItemGroup>
117117
<ItemGroup Condition="'$(CurrentProject)' != '' and '$(CurrentProject)' != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI' and '$(NuGetPackageVersion)' != 'To Fill In With Local Version Number'">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Microsoft.NET.CoreFramework.Debug.2.2.appx
22
Microsoft.NET.CoreRuntime.2.2.appx
3-
Microsoft.UI.Xaml.2.5.appx
3+
Microsoft.UI.Xaml.2.6.appx
44
Microsoft.VCLibs.x86.Debug.14.00.appx
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Microsoft.NET.Native.Framework.2.2.appx
22
Microsoft.NET.Native.Runtime.2.2.appx
3-
Microsoft.UI.Xaml.2.5.appx
3+
Microsoft.UI.Xaml.2.6.appx
44
Microsoft.VCLibs.x86.14.00.appx

build/Windows.Toolkit.UWP.Controls.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</ItemGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
8+
<PackageReference Include="Microsoft.UI.Xaml" Version="2.6.1" />
99
</ItemGroup>
1010

1111
<PropertyGroup>

0 commit comments

Comments
 (0)