From 0e68b0f65cf25046bf3faf3eda2681389b8d5a03 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 20 Jul 2021 16:26:00 -0400 Subject: [PATCH 1/7] Update all revelvent winui 2.5.0 revs to 2.6.1 --- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 2 +- SmokeTests/SmokeTest.csproj | 2 +- UITests/UITests.Tests.TAEF/UITests.App.dependencies.Debug.txt | 2 +- UITests/UITests.Tests.TAEF/UITests.App.dependencies.Release.txt | 2 +- build/Windows.Toolkit.UWP.Controls.targets | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index 6f48f7891bf..458053823c2 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -111,7 +111,7 @@ --> - 2.5.0 + 2.6.1 0.7.0-alpha diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj index b7ddd6a6de8..619ad268ac0 100644 --- a/SmokeTests/SmokeTest.csproj +++ b/SmokeTests/SmokeTest.csproj @@ -111,7 +111,7 @@ - 2.5.0 + 2.6.1 diff --git a/UITests/UITests.Tests.TAEF/UITests.App.dependencies.Debug.txt b/UITests/UITests.Tests.TAEF/UITests.App.dependencies.Debug.txt index d3af77d31a9..6b295d22835 100644 --- a/UITests/UITests.Tests.TAEF/UITests.App.dependencies.Debug.txt +++ b/UITests/UITests.Tests.TAEF/UITests.App.dependencies.Debug.txt @@ -1,4 +1,4 @@ Microsoft.NET.CoreFramework.Debug.2.2.appx Microsoft.NET.CoreRuntime.2.2.appx -Microsoft.UI.Xaml.2.5.appx +Microsoft.UI.Xaml.2.6.appx Microsoft.VCLibs.x86.Debug.14.00.appx \ No newline at end of file diff --git a/UITests/UITests.Tests.TAEF/UITests.App.dependencies.Release.txt b/UITests/UITests.Tests.TAEF/UITests.App.dependencies.Release.txt index 6df135e9ec1..e4c6efce56f 100644 --- a/UITests/UITests.Tests.TAEF/UITests.App.dependencies.Release.txt +++ b/UITests/UITests.Tests.TAEF/UITests.App.dependencies.Release.txt @@ -1,4 +1,4 @@ Microsoft.NET.Native.Framework.2.2.appx Microsoft.NET.Native.Runtime.2.2.appx -Microsoft.UI.Xaml.2.5.appx +Microsoft.UI.Xaml.2.6.appx Microsoft.VCLibs.x86.14.00.appx \ No newline at end of file diff --git a/build/Windows.Toolkit.UWP.Controls.targets b/build/Windows.Toolkit.UWP.Controls.targets index 27089aa0fc7..eb94457ec4f 100644 --- a/build/Windows.Toolkit.UWP.Controls.targets +++ b/build/Windows.Toolkit.UWP.Controls.targets @@ -5,7 +5,7 @@ - + From d451b1f89a69007443d7cd7355bc236e5d9aeaa1 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Wed, 7 Jul 2021 14:49:15 -0400 Subject: [PATCH 2/7] Workaround: NavigationView issues under winui2.6 https://github.com/microsoft/microsoft-ui-xaml/issues/5299#issuecomment-875798060 --- Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml index 385e06e225c..7ca253ab7bb 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml @@ -34,6 +34,9 @@ MenuItemTemplate="{StaticResource CategoryTemplate}" PaneDisplayMode="Top" SelectionFollowsFocus="Disabled"> + + 0,0,0,0 + Date: Tue, 13 Jul 2021 12:49:14 -0400 Subject: [PATCH 3/7] Fix TileControl sample Under WinUI 2.6 the flip view has a brackground. Removing it for this sample. --- .../SamplePages/TileControl/TileControl.bind | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TileControl/TileControl.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TileControl/TileControl.bind index 81ae40efb10..7d9a854a31a 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TileControl/TileControl.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TileControl/TileControl.bind @@ -61,7 +61,7 @@ ImageSource="ms-appx:///SamplePages/TileControl/Animations.png" ParallaxSpeedRatio="@[Parallax Speed Ratio:DoubleSlider:1.2:1-3]" ScrollViewerContainer="{Binding ElementName=FlipView, Mode=OneTime}"> - + From 8aed05fe0f4dfdc252e46ffe4dd07a9373b53302 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Thu, 15 Jul 2021 11:56:04 -0400 Subject: [PATCH 4/7] Make Balde item better handle WinUI button style Instead of constrining the buttons size which broke when the style made content in the button take more space threw more padding. Now we have the buttons stretch to the height of the bar. --- .../BladeView/BladeView.xaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml index eb54cb3e313..9e4818f3d14 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.xaml @@ -156,8 +156,7 @@ Background="{TemplateBinding CloseButtonBackground}" Style="{StaticResource ButtonRevealStyle}" BorderThickness="1" - Width="32" - Height="32" + VerticalAlignment="Stretch" Content="" FontFamily="Segoe MDL2 Assets" FontSize="14" @@ -169,8 +168,7 @@ Background="{TemplateBinding CloseButtonBackground}" Style="{StaticResource ButtonRevealStyle}" BorderThickness="1" - Width="32" - Height="32" + VerticalAlignment="Stretch" Content="" FontFamily="Segoe MDL2 Assets" FontSize="14" From 9abaac712edffc398a2a6cb4416ca4f68b62586a Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Thu, 15 Jul 2021 12:12:33 -0400 Subject: [PATCH 5/7] Fix TolkenizingTextBoxItem close button. Set padding for close button to isolate from winui changes. --- .../TokenizingTextBox/TokenizingTextBoxItem.Token.xaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml index 0ca4cea0ba9..172e9de222c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml @@ -14,6 +14,7 @@ +