Skip to content

Commit 2e2ed3f

Browse files
michael-hawkermichael-hawker
authored
Merge branch 'master' into wrapPanelCollapsedItems
2 parents 767f3b5 + e743f04 commit 2e2ed3f

File tree

25 files changed

+203
-73
lines changed

25 files changed

+203
-73
lines changed

‎Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
- Guard: Helper methods to verify conditions when running code.
1212
- ThrowHelper: Helper methods to efficiently throw exceptions.
1313
</Description>
14-
<PackageTags>UWP Toolkit Windows IncrementalLoadingCollection String Array extensions helpers</PackageTags>
14+
<PackageTags>Windows;Community;Toolkit;WCT;UWP;Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;extensions;helpers</PackageTags>
1515
</PropertyGroup>
1616
<Choose>
1717
<When Condition=" '$(TargetFramework)' == 'netstandard1.4' ">

‎Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
- Ref&lt;T&gt;: a stack-only struct that can store a reference to a value of a specified type.
2323
- NullableRef&lt;T&gt;: a stack-only struct similar to Ref&lt;T&gt;, which also supports nullable references.
2424
</Description>
25-
<PackageTags>UWP Toolkit Windows core standard unsafe span memory string array stream buffer extensions helpers parallel performance</PackageTags>
25+
<PackageTags>Windows;Community;Toolkit;WCT;UWP;core;standard;unsafe;span;memory;string;array;stream;buffer;extensions;helpers;parallel;performance</PackageTags>
2626
</PropertyGroup>
2727
<Choose>
2828
<When Condition=" '$(TargetFramework)' == 'netstandard1.4' ">

‎Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
- StrongReferenceMessenger: a high-performance messaging system that trades weak references for speed.
1818
- Ioc: a helper class to configure dependency injection service containers.
1919
</Description>
20-
<PackageTags>UWP Toolkit Windows MVVM MVVMToolkit observable Ioc dependency injection services extensions helpers</PackageTags>
20+
<PackageTags>Windows;Community;Toolkit;WCT;UWP;WinUI;WPF;Xamarin;Forms;Uno;Platform;MVVM;Toolkit;MVVMToolkit;INotifyPropertyChanged;observable;Ioc;dependency injection;services;extensions;helpers</PackageTags>
2121
</PropertyGroup>
2222

2323
<!-- .NET Standard 2.0 doesn't have the Span<T> and IAsyncEnumerable<T> types -->

‎Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>uap10.0.17763</TargetFrameworks>
55
<Title>Windows Community Toolkit Devices</Title>
66
<Description>This library enables easier consumption of connectivity Devices/Peripherals and handle its connection to Windows devices. It contains BluetoothLE and Network connectivity helpers.</Description>
7-
<PackageTags>UWP Toolkit Windows Devices Bluetooth BluetoothLE BLE Networking</PackageTags>
7+
<PackageTags>Windows;Community;Toolkit;WCT;UWP;Devices;Bluetooth;LE;BluetoothLE;BLE;Networking</PackageTags>
88
</PropertyGroup>
99

1010
<ItemGroup>

‎Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
-FocusTrackerControl : The FocusTracker Control is a feature that can be used to display information about the current focused XAML element.
1010
-Themes : Provides the source path of the resource dictionaries for the FocusTracker.
1111
</Description>
12-
<PackageTags>UWP Toolkit Windows Controls XAML Developer Tools Accessibility AlignmentGrid</PackageTags>
12+
<PackageTags>Windows;Community;Toolkit;WCT;UWP;Controls;XAML;Developer;Tools;Accessibility;Alignment;Grid;AlignmentGrid</PackageTags>
1313
<!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
1414
<EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
1515
</PropertyGroup>

‎Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>uap10.0.17134</TargetFramework>
55
<Title>Windows Community Toolkit Eye Gaze Library</Title>
66
<Description>A library to integrate gaze interactions using eye trackers into UWP applications</Description>
7-
<PackageTags>UWP Toolkit Windows Eye Gaze EyeTracker</PackageTags>
7+
<PackageTags>Windows;Community;Toolkit;WCT;UWP;Gaze;Eye;Tracker;EyeTracker</PackageTags>
88
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
99
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
1010
</PropertyGroup>

‎Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotifierCompat.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ private void PreprocessToast(ToastNotification notification)
143143
// For apps that don't have identity...
144144
if (!DesktopBridgeHelpers.HasIdentity())
145145
{
146-
// If tag is specified
147-
if (!string.IsNullOrEmpty(notification.Tag))
146+
// If tag is specified and group isn't specified
147+
if (!string.IsNullOrEmpty(notification.Tag) && string.IsNullOrEmpty(notification.Group))
148148
{
149-
// If group isn't specified, we have to add a group since otherwise can't remove without a group
149+
// We have to add a group since otherwise can't remove without a group
150150
notification.Group = ToastNotificationManagerCompat.DEFAULT_GROUP;
151151
}
152152
}
@@ -157,10 +157,10 @@ private void PreprocessScheduledToast(ScheduledToastNotification notification)
157157
// For apps that don't have identity...
158158
if (!DesktopBridgeHelpers.HasIdentity())
159159
{
160-
// If tag is specified
161-
if (!string.IsNullOrEmpty(notification.Tag))
160+
// If tag is specified and group isn't specified
161+
if (!string.IsNullOrEmpty(notification.Tag) && string.IsNullOrEmpty(notification.Group))
162162
{
163-
// If group isn't specified, we have to add a group since otherwise can't remove without a group
163+
// We have to add a group since otherwise can't remove without a group
164164
notification.Group = ToastNotificationManagerCompat.DEFAULT_GROUP;
165165
}
166166
}

‎Microsoft.Toolkit.Uwp.UI.Animations/Implicit.cs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using Windows.Foundation.Collections;
5+
using System;
66
using Windows.UI.Xaml;
77
using Windows.UI.Xaml.Hosting;
88

@@ -130,30 +130,30 @@ public static void SetAnimations(UIElement element, ImplicitAnimationSet value)
130130
/// <param name="e">The <see cref="DependencyPropertyChangedEventArgs"/> instance for the current event.</param>
131131
private static void OnShowAnimationsPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
132132
{
133-
static void OnAnimationsChanged(IObservableVector<DependencyObject> sender, IVectorChangedEventArgs args)
133+
static void OnAnimationsChanged(object sender, EventArgs e)
134134
{
135135
var collection = (ImplicitAnimationSet)sender;
136136

137137
if (collection.ParentReference!.TryGetTarget(out UIElement element))
138138
{
139-
ElementCompositionPreview.SetImplicitShowAnimation(element, collection.GetCompositionAnimationGroup());
139+
ElementCompositionPreview.SetImplicitShowAnimation(element, collection.GetCompositionAnimationGroup(element));
140140
}
141141
}
142142

143143
if (e.OldValue is ImplicitAnimationSet oldCollection)
144144
{
145-
oldCollection.VectorChanged -= OnAnimationsChanged;
145+
oldCollection.AnimationsChanged -= OnAnimationsChanged;
146146
}
147147

148148
if (d is UIElement element &&
149149
e.NewValue is ImplicitAnimationSet collection)
150150
{
151151
collection.ParentReference = new(element);
152-
collection.VectorChanged -= OnAnimationsChanged;
153-
collection.VectorChanged += OnAnimationsChanged;
152+
collection.AnimationsChanged -= OnAnimationsChanged;
153+
collection.AnimationsChanged += OnAnimationsChanged;
154154

155155
ElementCompositionPreview.SetIsTranslationEnabled(element, true);
156-
ElementCompositionPreview.SetImplicitShowAnimation(element, collection.GetCompositionAnimationGroup());
156+
ElementCompositionPreview.SetImplicitShowAnimation(element, collection.GetCompositionAnimationGroup(element));
157157
}
158158
}
159159

@@ -164,30 +164,30 @@ static void OnAnimationsChanged(IObservableVector<DependencyObject> sender, IVec
164164
/// <param name="e">The <see cref="DependencyPropertyChangedEventArgs"/> instance for the current event.</param>
165165
private static void OnHideAnimationsPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
166166
{
167-
static void OnAnimationsChanged(IObservableVector<DependencyObject> sender, IVectorChangedEventArgs args)
167+
static void OnAnimationsChanged(object sender, EventArgs e)
168168
{
169169
var collection = (ImplicitAnimationSet)sender;
170170

171171
if (collection.ParentReference!.TryGetTarget(out UIElement element))
172172
{
173-
ElementCompositionPreview.SetImplicitHideAnimation(element, collection.GetCompositionAnimationGroup());
173+
ElementCompositionPreview.SetImplicitHideAnimation(element, collection.GetCompositionAnimationGroup(element));
174174
}
175175
}
176176

177177
if (e.OldValue is ImplicitAnimationSet oldCollection)
178178
{
179-
oldCollection.VectorChanged -= OnAnimationsChanged;
179+
oldCollection.AnimationsChanged -= OnAnimationsChanged;
180180
}
181181

182182
if (d is UIElement element &&
183183
e.NewValue is ImplicitAnimationSet collection)
184184
{
185185
collection.ParentReference = new(element);
186-
collection.VectorChanged -= OnAnimationsChanged;
187-
collection.VectorChanged += OnAnimationsChanged;
186+
collection.AnimationsChanged -= OnAnimationsChanged;
187+
collection.AnimationsChanged += OnAnimationsChanged;
188188

189189
ElementCompositionPreview.SetIsTranslationEnabled(element, true);
190-
ElementCompositionPreview.SetImplicitHideAnimation(element, collection.GetCompositionAnimationGroup());
190+
ElementCompositionPreview.SetImplicitHideAnimation(element, collection.GetCompositionAnimationGroup(element));
191191
}
192192
}
193193

@@ -198,30 +198,30 @@ static void OnAnimationsChanged(IObservableVector<DependencyObject> sender, IVec
198198
/// <param name="e">The <see cref="DependencyPropertyChangedEventArgs"/> instance for the current event.</param>
199199
private static void OnAnimationsPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
200200
{
201-
static void OnAnimationsChanged(IObservableVector<DependencyObject> sender, IVectorChangedEventArgs args)
201+
static void OnAnimationsChanged(object sender, EventArgs e)
202202
{
203203
var collection = (ImplicitAnimationSet)sender;
204204

205205
if (collection.ParentReference!.TryGetTarget(out UIElement element))
206206
{
207-
ElementCompositionPreview.GetElementVisual(element).ImplicitAnimations = collection.GetImplicitAnimationCollection();
207+
ElementCompositionPreview.GetElementVisual(element).ImplicitAnimations = collection.GetImplicitAnimationCollection(element);
208208
}
209209
}
210210

211211
if (e.OldValue is ImplicitAnimationSet oldCollection)
212212
{
213-
oldCollection.VectorChanged -= OnAnimationsChanged;
213+
oldCollection.AnimationsChanged -= OnAnimationsChanged;
214214
}
215215

216216
if (d is UIElement element &&
217217
e.NewValue is ImplicitAnimationSet collection)
218218
{
219219
collection.ParentReference = new(element);
220-
collection.VectorChanged -= OnAnimationsChanged;
221-
collection.VectorChanged += OnAnimationsChanged;
220+
collection.AnimationsChanged -= OnAnimationsChanged;
221+
collection.AnimationsChanged += OnAnimationsChanged;
222222

223223
ElementCompositionPreview.SetIsTranslationEnabled(element, true);
224-
ElementCompositionPreview.GetElementVisual(element).ImplicitAnimations = collection.GetImplicitAnimationCollection();
224+
ElementCompositionPreview.GetElementVisual(element).ImplicitAnimations = collection.GetImplicitAnimationCollection(element);
225225
}
226226
}
227227
}

‎Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
- Expressions: ExpressionNodes, ExpressionValues, ReferenceNodes, CompositionExtensions, ExpressionFunctions, OperationType
1515
- AnimationExtensions: Blur, Fade, Light, Offset, Rotate, Saturation, Scale
1616
</Description>
17-
<PackageTags>UWP Toolkit Windows Animations Composition Connected Implicit XAML</PackageTags>
17+
<PackageTags>Windows;Community;Toolkit;WCT;UWP;Animations;Composition;Connected;Implicit;XAML</PackageTags>
1818
<LangVersion>9.0</LangVersion>
1919
</PropertyGroup>
2020

‎Microsoft.Toolkit.Uwp.UI.Animations/Xaml/Abstract/Animation.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ public EasingMode? EasingMode
9191
/// </summary>
9292
public RepeatOption Repeat
9393
{
94-
get => (RepeatOption)GetValue(RepeatOptionProperty);
95-
set => SetValue(RepeatOptionProperty, value);
94+
get => (RepeatOption)GetValue(RepeatProperty);
95+
set => SetValue(RepeatProperty, value);
9696
}
9797

9898
/// <summary>
9999
/// Identifies the <seealso cref="Repeat"/> dependency property.
100100
/// </summary>
101-
public static readonly DependencyProperty RepeatOptionProperty = DependencyProperty.Register(
101+
public static readonly DependencyProperty RepeatProperty = DependencyProperty.Register(
102102
nameof(Repeat),
103103
typeof(RepeatOption),
104104
typeof(Animation),

0 commit comments

Comments
 (0)