Skip to content
This repository was archived by the owner on Feb 25, 2026. It is now read-only.

Commit 617a960

Browse files
michael-hawkermichael-hawker
authored
Merge pull request #3301 from windows-toolkit/mhawker/dependency-update
Update NuGet Dependencies & Clean-up
2 parents ef37da0 + 07516d8 commit 617a960

19 files changed

Lines changed: 62 additions & 68 deletions

File tree

‎Directory.Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageIconUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png</PackageIconUrl>
88
<PackageProjectUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit</PackageProjectUrl>
99
<PackageLicenseUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/license.md</PackageLicenseUrl>
10-
<PackageReleaseNotes>v3.0 release https://github.com/windows-toolkit/WindowsCommunityToolkit/releases</PackageReleaseNotes>
10+
<PackageReleaseNotes>https://github.com/windows-toolkit/WindowsCommunityToolkit/releases</PackageReleaseNotes>
1111
<Copyright>(c) .NET Foundation and Contributors. All rights reserved.</Copyright>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<IsDesignProject>$(MSBuildProjectName.Contains('.Design'))</IsDesignProject>
@@ -51,8 +51,8 @@
5151
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
5252
</PropertyGroup>
5353
<ItemGroup>
54-
<PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
55-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
54+
<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All"/>
55+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
5656
</ItemGroup>
5757
</When>
5858
</Choose>
@@ -86,7 +86,7 @@
8686
</PropertyGroup>
8787

8888
<ItemGroup>
89-
<PackageReference Include="Nerdbank.GitVersioning" Version=" 2.1.65" PrivateAssets="all" />
89+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="all" />
9090
</ItemGroup>
9191

9292
<ItemGroup>

‎Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
<ItemGroup>
2929
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
30-
<PackageReference Include="System.Net.Http" Version="4.3.3" />
30+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
3131
</ItemGroup>
3232

3333
<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.16299'">

‎Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</ItemGroup>
5454

5555
<ItemGroup>
56-
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
56+
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
5757
</ItemGroup>
5858

5959
<PropertyGroup Condition="'$(TargetFramework)' == 'native'">

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<Version>1.0.5</Version>
131131
</PackageReference>
132132
<PackageReference Include="System.ValueTuple">
133-
<Version>4.4.0</Version>
133+
<Version>4.5.0</Version>
134134
</PackageReference>
135135
</ItemGroup>
136136
<ItemGroup>
@@ -614,6 +614,7 @@
614614
<Content Include="SamplePages\Triggers\RegexStateTrigger.bind" />
615615
<Content Include="SamplePages\Triggers\UserHandPreferenceStateTrigger.bind" />
616616
<Content Include="SamplePages\Triggers\UserInteractionModeStateTrigger.bind" />
617+
<Content Include="SamplePages\StaggeredLayout\StaggeredLayout.bind" />
617618
</ItemGroup>
618619
<ItemGroup>
619620
<Compile Include="App.xaml.cs">

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayout.bind‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,17 @@
2121
</Page.Resources>
2222

2323
<Grid Padding="48">
24-
<ScrollViewer >
25-
<winui:ItemsRepeater x:Name="StaggeredRepeater"
26-
ItemTemplate="{StaticResource StaggeredTemplate}">
27-
<winui:ItemsRepeater.Layout>
28-
<controls:StaggeredLayout DesiredColumnWidth="@[DesiredColumnWidth:Slider:250:50-400]"
29-
ColumnSpacing="@[ColumnSpacing:Slider:5:0-50]@"
30-
RowSpacing="@[RowSpacing:Slider:5:0-50]@"/>
31-
</winui:ItemsRepeater.Layout>
32-
</winui:ItemsRepeater>
33-
</ScrollViewer>
24+
<winui:ItemsRepeaterScrollHost> <!-- Needed for 1803 and below -->
25+
<ScrollViewer>
26+
<winui:ItemsRepeater x:Name="StaggeredRepeater"
27+
ItemTemplate="{StaticResource StaggeredTemplate}">
28+
<winui:ItemsRepeater.Layout>
29+
<controls:StaggeredLayout DesiredColumnWidth="@[DesiredColumnWidth:Slider:250:50-400]"
30+
ColumnSpacing="@[ColumnSpacing:Slider:5:0-50]@"
31+
RowSpacing="@[RowSpacing:Slider:5:0-50]@"/>
32+
</winui:ItemsRepeater.Layout>
33+
</winui:ItemsRepeater>
34+
</ScrollViewer>
35+
</winui:ItemsRepeaterScrollHost>
3436
</Grid>
3537
</Page>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@
22
x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.StaggeredLayoutPage"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages.StaggeredLayout"
65
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
76
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
87
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
8+
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
99
mc:Ignorable="d"
1010
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
1111

1212
<Page.Resources>
1313
<controls:StaggeredLayout x:Key="WrapLayoutPlaceholder"/>
1414
</Page.Resources>
15+
16+
<!-- Needed fpr 1803 and below -->
17+
<winui:ItemsRepeaterScrollHost>
18+
<ScrollViewer>
19+
<winui:ItemsRepeater/>
20+
</ScrollViewer>
21+
</winui:ItemsRepeaterScrollHost>
1522
</Page>

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapLayout/WrapLayout.bind‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,18 @@
1818
</Page.Resources>
1919

2020
<Grid Padding="48">
21-
<ScrollViewer >
22-
<winui:ItemsRepeater x:Name="WrapRepeater"
23-
Background="{ThemeResource Brush-Grey-04}"
24-
ItemTemplate="{StaticResource WrapTemplate}">
25-
<winui:ItemsRepeater.Layout>
26-
<controls:WrapLayout x:Name="Wrap"
27-
VerticalSpacing="@[VerticalSpacing:Slider:5:0-200]@"
28-
HorizontalSpacing="@[HorizontalSpacing:Slider:5:0-200]@"/>
29-
</winui:ItemsRepeater.Layout>
30-
</winui:ItemsRepeater>
31-
</ScrollViewer>
21+
<winui:ItemsRepeaterScrollHost> <!-- Needed for 1803 and below -->
22+
<ScrollViewer>
23+
<winui:ItemsRepeater x:Name="WrapRepeater"
24+
Background="{ThemeResource Brush-Grey-04}"
25+
ItemTemplate="{StaticResource WrapTemplate}">
26+
<winui:ItemsRepeater.Layout>
27+
<controls:WrapLayout x:Name="Wrap"
28+
VerticalSpacing="@[VerticalSpacing:Slider:5:0-200]@"
29+
HorizontalSpacing="@[HorizontalSpacing:Slider:5:0-200]@"/>
30+
</winui:ItemsRepeater.Layout>
31+
</winui:ItemsRepeater>
32+
</ScrollViewer>
33+
</winui:ItemsRepeaterScrollHost>
3234
</Grid>
3335
</Page>

‎Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Linq;
88
using System.Numerics;
99
using System.Threading.Tasks;
10+
using Microsoft.Toolkit.Uwp.Helpers;
1011
using Microsoft.Toolkit.Uwp.SampleApp.Pages;
1112
using Microsoft.Toolkit.Uwp.UI.Animations;
1213
using Microsoft.Toolkit.Uwp.UI.Controls;
@@ -137,6 +138,9 @@ private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende
137138
{
138139
_selectedCategory = category;
139140
ShowSamplePicker(category.Samples, true);
141+
142+
// Then Focus on Picker
143+
DispatcherHelper.ExecuteOnUIThreadAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));
140144
}
141145
}
142146
else if (args.IsSettingsInvoked)

‎Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
using System;
66
using System.Linq;
7+
using Microsoft.Toolkit.Uwp.Helpers;
78
using Microsoft.Toolkit.Uwp.UI.Extensions;
89
using Windows.UI.Xaml;
910
using Windows.UI.Xaml.Controls;
@@ -36,7 +37,7 @@ internal void StartSearch(string startingText = null)
3637
}
3738
}
3839

39-
private async void UpdateSearchSuggestions(bool focus = false)
40+
private async void UpdateSearchSuggestions()
4041
{
4142
if (string.IsNullOrWhiteSpace(SearchBox.Text))
4243
{
@@ -48,10 +49,6 @@ private async void UpdateSearchSuggestions(bool focus = false)
4849
if (samples.Count() > 0)
4950
{
5051
ShowSamplePicker(samples);
51-
if (focus)
52-
{
53-
SamplePickerGridView.Focus(FocusState.Keyboard);
54-
}
5552
}
5653
else
5754
{
@@ -66,9 +63,10 @@ private void SearchBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChan
6663

6764
private void SearchBox_KeyDown(object sender, Windows.UI.Xaml.Input.KeyRoutedEventArgs e)
6865
{
69-
if (e.Key == Windows.System.VirtualKey.Down)
66+
if (e.Key == Windows.System.VirtualKey.Down && SamplePickerGrid.Visibility == Windows.UI.Xaml.Visibility.Visible)
7067
{
71-
UpdateSearchSuggestions(true);
68+
// If we try and navigate down out of the textbox (and there's search results), go to the search results.
69+
DispatcherHelper.ExecuteOnUIThreadAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));
7270
}
7371
}
7472

‎Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
<GridView x:Name="SamplePickerGridView"
9292
animations:ReorderGridAnimation.Duration="200"
9393
IsItemClickEnabled="True"
94-
Loaded="SamplePickerGridView_Loaded"
9594
ItemContainerStyle="{StaticResource SamplePickerItemStyle}"
9695
ItemContainerTransitions="{x:Null}"
9796
ItemTemplate="{StaticResource SampleTemplate}"

0 commit comments

Comments
 (0)