Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update NuGet Dependencies & Clean-up #3301

Merged
merged 7 commits into from
May 28, 2020
Merged

Update NuGet Dependencies & Clean-up #3301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7d39bc2
Fix tests.
azchohfi May 19, 2020
a631c6e
Update NuGet packages
michael-hawker May 26, 2020
572f31e
Clean-up Focus Stealing on Search
michael-hawker May 19, 2020
703333e
Re-add StaggeredLayout sample file to the project
michael-hawker May 20, 2020
b91c162
Add scroll host to Layout samples
michael-hawker May 20, 2020
f737eaa
Update InheritDoc version to 2.5.2
michael-hawker May 21, 2020
07516d8
Merge branch 'master' into mhawker/dependency-update
michael-hawker May 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PackageIconUrl>https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/license.md</PackageLicenseUrl>
<PackageReleaseNotes>v3.0 release https://github.com/windows-toolkit/WindowsCommunityToolkit/releases</PackageReleaseNotes>
<PackageReleaseNotes>https://github.com/windows-toolkit/WindowsCommunityToolkit/releases</PackageReleaseNotes>
<Copyright>(c) .NET Foundation and Contributors. All rights reserved.</Copyright>
<DefaultLanguage>en-US</DefaultLanguage>
<IsDesignProject>$(MSBuildProjectName.Contains('.Design'))</IsDesignProject>
Expand Down Expand Up @@ -51,8 +51,8 @@
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
</ItemGroup>
</When>
</Choose>
Expand Down Expand Up @@ -86,7 +86,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version=" 2.1.65" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="System.Net.Http" Version="4.3.3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.16299'">
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'native'">
Expand Down
3 changes: 2 additions & 1 deletion Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
<Version>1.0.5</Version>
</PackageReference>
<PackageReference Include="System.ValueTuple">
<Version>4.4.0</Version>
<Version>4.5.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -614,6 +614,7 @@
<Content Include="SamplePages\Triggers\RegexStateTrigger.bind" />
<Content Include="SamplePages\Triggers\UserHandPreferenceStateTrigger.bind" />
<Content Include="SamplePages\Triggers\UserInteractionModeStateTrigger.bind" />
<Content Include="SamplePages\StaggeredLayout\StaggeredLayout.bind" />
</ItemGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
Expand Down
22 changes: 12 additions & 10 deletions Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayout.bind
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,17 @@
</Page.Resources>

<Grid Padding="48">
<ScrollViewer >
<winui:ItemsRepeater x:Name="StaggeredRepeater"
ItemTemplate="{StaticResource StaggeredTemplate}">
<winui:ItemsRepeater.Layout>
<controls:StaggeredLayout DesiredColumnWidth="@[DesiredColumnWidth:Slider:250:50-400]"
ColumnSpacing="@[ColumnSpacing:Slider:5:0-50]@"
RowSpacing="@[RowSpacing:Slider:5:0-50]@"/>
</winui:ItemsRepeater.Layout>
</winui:ItemsRepeater>
</ScrollViewer>
<winui:ItemsRepeaterScrollHost> <!-- Needed for 1803 and below -->
<ScrollViewer>
<winui:ItemsRepeater x:Name="StaggeredRepeater"
ItemTemplate="{StaticResource StaggeredTemplate}">
<winui:ItemsRepeater.Layout>
<controls:StaggeredLayout DesiredColumnWidth="@[DesiredColumnWidth:Slider:250:50-400]"
ColumnSpacing="@[ColumnSpacing:Slider:5:0-50]@"
RowSpacing="@[RowSpacing:Slider:5:0-50]@"/>
</winui:ItemsRepeater.Layout>
</winui:ItemsRepeater>
</ScrollViewer>
</winui:ItemsRepeaterScrollHost>
</Grid>
</Page>
9 changes: 8 additions & 1 deletion Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredLayout/StaggeredLayoutPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}">

<Page.Resources>
<controls:StaggeredLayout x:Key="WrapLayoutPlaceholder"/>
</Page.Resources>

<!-- Needed fpr 1803 and below -->
<winui:ItemsRepeaterScrollHost>
<ScrollViewer>
<winui:ItemsRepeater/>
</ScrollViewer>
</winui:ItemsRepeaterScrollHost>
</Page>
24 changes: 13 additions & 11 deletions Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapLayout/WrapLayout.bind
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,18 @@
</Page.Resources>

<Grid Padding="48">
<ScrollViewer >
<winui:ItemsRepeater x:Name="WrapRepeater"
Background="{ThemeResource Brush-Grey-04}"
ItemTemplate="{StaticResource WrapTemplate}">
<winui:ItemsRepeater.Layout>
<controls:WrapLayout x:Name="Wrap"
VerticalSpacing="@[VerticalSpacing:Slider:5:0-200]@"
HorizontalSpacing="@[HorizontalSpacing:Slider:5:0-200]@"/>
</winui:ItemsRepeater.Layout>
</winui:ItemsRepeater>
</ScrollViewer>
<winui:ItemsRepeaterScrollHost> <!-- Needed for 1803 and below -->
<ScrollViewer>
<winui:ItemsRepeater x:Name="WrapRepeater"
Background="{ThemeResource Brush-Grey-04}"
ItemTemplate="{StaticResource WrapTemplate}">
<winui:ItemsRepeater.Layout>
<controls:WrapLayout x:Name="Wrap"
VerticalSpacing="@[VerticalSpacing:Slider:5:0-200]@"
HorizontalSpacing="@[HorizontalSpacing:Slider:5:0-200]@"/>
</winui:ItemsRepeater.Layout>
</winui:ItemsRepeater>
</ScrollViewer>
</winui:ItemsRepeaterScrollHost>
</Grid>
</Page>
4 changes: 4 additions & 0 deletions Microsoft.Toolkit.Uwp.SampleApp/Shell.SamplePicker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
12 changes: 5 additions & 7 deletions Microsoft.Toolkit.Uwp.SampleApp/Shell.Search.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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))
{
Expand All @@ -48,10 +49,6 @@ private async void UpdateSearchSuggestions(bool focus = false)
if (samples.Count() > 0)
{
ShowSamplePicker(samples);
if (focus)
{
SamplePickerGridView.Focus(FocusState.Keyboard);
}
}
else
{
Expand All @@ -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));
}
}

Expand Down
1 change: 0 additions & 1 deletion Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
<GridView x:Name="SamplePickerGridView"
animations:ReorderGridAnimation.Duration="200"
IsItemClickEnabled="True"
Loaded="SamplePickerGridView_Loaded"
ItemContainerStyle="{StaticResource SamplePickerItemStyle}"
ItemContainerTransitions="{x:Null}"
ItemTemplate="{StaticResource SampleTemplate}"
Expand Down
14 changes: 1 addition & 13 deletions Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using Microsoft.Toolkit.Uwp.Helpers;
using Microsoft.Toolkit.Uwp.SampleApp.Pages;
using Microsoft.Toolkit.Uwp.UI.Extensions;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media.Animation;
using Windows.UI.Xaml.Navigation;
Expand Down Expand Up @@ -120,16 +119,5 @@ private void SamplePickerGridView_ItemClick(object sender, ItemClickEventArgs e)
HideSamplePicker();
NavigateToSample(e.ClickedItem as Sample);
}

private void SamplePickerGridView_Loaded(object sender, Windows.UI.Xaml.RoutedEventArgs e)
{
SamplePickerGrid.RegisterPropertyChangedCallback(UIElement.VisibilityProperty, (s, args) =>
{
if (s is UIElement samplePicker && samplePicker.Visibility == Visibility.Visible)
{
DispatcherHelper.ExecuteOnUIThreadAsync(() => SamplePickerGridView.Focus(FocusState.Keyboard));
}
});
}
}
}
}
4 changes: 2 additions & 2 deletions Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="Win2D.uwp" Version="1.24.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="Win2D.uwp" Version="1.25.0" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1" />
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

<ItemGroup>
<PackageReference Include="ColorCode.UWP" Version="2.0.6" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Animations\Microsoft.Toolkit.Uwp.UI.Animations.csproj" />
<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
<ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
<PackageReference Include="Win2D.uwp" Version="1.24.0" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="Win2D.uwp" Version="1.25.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>

<IsPackable>false</IsPackable>

Expand Down
2 changes: 1 addition & 1 deletion UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<Version>2.1.0</Version>
</PackageReference>
<PackageReference Include="System.Xml.ReaderWriter">
<Version>4.3.0</Version>
<Version>4.3.1</Version>
</PackageReference>
<PackageReference Include="System.Xml.XPath.XmlDocument">
<Version>4.3.0</Version>
Expand Down
4 changes: 2 additions & 2 deletions UnitTests/UnitTests.UWP/UnitTests.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions">
<Version>5.10.2</Version>
<Version>5.10.3</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.9</Version>
Expand Down Expand Up @@ -475,4 +475,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
7 changes: 0 additions & 7 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions build/build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down