diff --git a/Directory.Build.props b/Directory.Build.props
index 3bc21e35291..71c69d86fc9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,7 +7,7 @@
https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png
https://github.com/windows-toolkit/WindowsCommunityToolkit
https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/license.md
- v3.0 release https://github.com/windows-toolkit/WindowsCommunityToolkit/releases
+ https://github.com/windows-toolkit/WindowsCommunityToolkit/releases
(c) .NET Foundation and Contributors. All rights reserved.
en-US
$(MSBuildProjectName.Contains('.Design'))
@@ -51,8 +51,8 @@
$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
-
-
+
+
@@ -86,7 +86,7 @@
-
+
diff --git a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
index d4cdb39b4da..5472a065af9 100644
--- a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
+++ b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
@@ -27,7 +27,7 @@
-
+
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index 9ceccd958ec..6c2e7222af4 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -53,7 +53,7 @@
-
+
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
index f56a95d7663..d1cbca55189 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -130,7 +130,7 @@
1.0.5
- 4.4.0
+ 4.5.0
@@ -614,6 +614,7 @@
+
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayout.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayout.bind
index 089b5918bb1..5138e8eb99e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayout.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayout.bind
@@ -21,15 +21,17 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml
index 77f992e38fc..1b245955036 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml
@@ -2,14 +2,21 @@
x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.StaggeredLayoutPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages.StaggeredLayout"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+ xmlns:winui="using:Microsoft.UI.Xaml.Controls"
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+
+
+
+
+
+
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapLayout/WrapLayout.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapLayout/WrapLayout.bind
index 18549c16f82..01c0c7324a5 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapLayout/WrapLayout.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapLayout/WrapLayout.bind
@@ -18,16 +18,18 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs b/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs
index 936e8fffb82..d05e0584a69 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs
@@ -7,6 +7,7 @@
using System.Linq;
using System.Numerics;
using System.Threading.Tasks;
+using Microsoft.Toolkit.Uwp.Helpers;
using Microsoft.Toolkit.Uwp.SampleApp.Pages;
using Microsoft.Toolkit.Uwp.UI.Animations;
using Microsoft.Toolkit.Uwp.UI.Controls;
@@ -137,6 +138,9 @@ private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende
{
_selectedCategory = category;
ShowSamplePicker(category.Samples, true);
+
+ // Then Focus on Picker
+ DispatcherHelper.ExecuteOnUIThreadAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));
}
}
else if (args.IsSettingsInvoked)
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs b/Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs
index 92c3ab1f6f2..45975cc7787 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs
@@ -4,6 +4,7 @@
using System;
using System.Linq;
+using Microsoft.Toolkit.Uwp.Helpers;
using Microsoft.Toolkit.Uwp.UI.Extensions;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
@@ -36,7 +37,7 @@ internal void StartSearch(string startingText = null)
}
}
- private async void UpdateSearchSuggestions(bool focus = false)
+ private async void UpdateSearchSuggestions()
{
if (string.IsNullOrWhiteSpace(SearchBox.Text))
{
@@ -48,10 +49,6 @@ private async void UpdateSearchSuggestions(bool focus = false)
if (samples.Count() > 0)
{
ShowSamplePicker(samples);
- if (focus)
- {
- SamplePickerGridView.Focus(FocusState.Keyboard);
- }
}
else
{
@@ -66,9 +63,10 @@ private void SearchBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChan
private void SearchBox_KeyDown(object sender, Windows.UI.Xaml.Input.KeyRoutedEventArgs e)
{
- if (e.Key == Windows.System.VirtualKey.Down)
+ if (e.Key == Windows.System.VirtualKey.Down && SamplePickerGrid.Visibility == Windows.UI.Xaml.Visibility.Visible)
{
- UpdateSearchSuggestions(true);
+ // If we try and navigate down out of the textbox (and there's search results), go to the search results.
+ DispatcherHelper.ExecuteOnUIThreadAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));
}
}
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml
index 09b125b9a35..2cf8264d642 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml
+++ b/Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml
@@ -91,7 +91,6 @@
- {
- if (s is UIElement samplePicker && samplePicker.Visibility == Visibility.Visible)
- {
- DispatcherHelper.ExecuteOnUIThreadAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));
- }
- });
- }
}
-}
\ No newline at end of file
+}
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj b/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj
index 93df74b440c..e2542fcca87 100644
--- a/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj
@@ -20,8 +20,8 @@
-
-
+
+
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
index c6a0a74d31d..1bb5b7c7c51 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
@@ -47,7 +47,7 @@
-
+
diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
index 02b3fc4ac1e..51bf3e87f5b 100644
--- a/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
+++ b/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
@@ -40,7 +40,7 @@
-
-
+
+
diff --git a/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj b/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj
index 155195ab491..a39e02bec29 100644
--- a/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj
+++ b/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.0
+ netcoreapp2.1
false
diff --git a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
index cf46a3dfb57..b523c47da21 100644
--- a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
+++ b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
@@ -133,7 +133,7 @@
2.1.0
- 4.3.0
+ 4.3.1
4.3.0
diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
index 4068af3426d..52e281e58a6 100644
--- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
+++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
@@ -104,7 +104,7 @@
- 5.10.2
+ 5.10.3
6.2.9
@@ -475,4 +475,4 @@
-->
-
+
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 470139e8cb8..00a8abf8be2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -25,13 +25,6 @@ steps:
inputs:
versionSpec: 5.0.0
-- task: UseDotNet@2
- inputs:
- packageType: 'sdk'
- version: '2.1.202' # This SDK contains .Net Core 2.0.9, which we still need to run some of our .Net Core Tests
- performMultiLevelLookup: true
- displayName: Use .NET Core sdk 2
-
- task: UseDotNet@2
inputs:
packageType: 'sdk'
diff --git a/build/build.cake b/build/build.cake
index 4fc4c50b269..51d5ed13ee7 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -20,8 +20,8 @@ var target = Argument("target", "Default");
// VERSIONS
//////////////////////////////////////////////////////////////////////
-var gitVersioningVersion = "2.1.65";
-var inheritDocVersion = "1.1.1.1";
+var gitVersioningVersion = "3.1.91";
+var inheritDocVersion = "2.5.2";
//////////////////////////////////////////////////////////////////////
// VARIABLES