Merge pull request #3880 from windows-toolkit/dev/7.0.1

michael-hawker · web-flow · commit 14cbe9f3d3d8 · 2021-03-23T11:02:42.000-07:00
Merge Dev/7.0.1 into main
diff --git a/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj b/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj
@@ -11,7 +11,7 @@
         - Guard: Helper methods to verify conditions when running code.
         - ThrowHelper: Helper methods to efficiently throw exceptions.
     </Description>
-    <PackageTags>UWP Toolkit Windows IncrementalLoadingCollection String Array extensions helpers</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;extensions;helpers</PackageTags>
   </PropertyGroup>
   <Choose>
     <When Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
diff --git a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj
@@ -22,7 +22,7 @@
       - Ref&lt;T&gt;: a stack-only struct that can store a reference to a value of a specified type.
       - NullableRef&lt;T&gt;: a stack-only struct similar to Ref&lt;T&gt;, which also supports nullable references.
   </Description>
-    <PackageTags>UWP Toolkit Windows core standard unsafe span memory string array stream buffer extensions helpers parallel performance</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;core;standard;unsafe;span;memory;string;array;stream;buffer;extensions;helpers;parallel;performance</PackageTags>
   </PropertyGroup>
   <Choose>
     <When Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj
@@ -17,7 +17,7 @@
       - StrongReferenceMessenger: a high-performance messaging system that trades weak references for speed.
       - Ioc: a helper class to configure dependency injection service containers.
     </Description>
-    <PackageTags>UWP Toolkit Windows MVVM MVVMToolkit observable Ioc dependency injection services extensions helpers</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;WinUI;WPF;Xamarin;Forms;Uno;Platform;MVVM;Toolkit;MVVMToolkit;INotifyPropertyChanged;observable;Ioc;dependency injection;services;extensions;helpers</PackageTags>
   </PropertyGroup>
 
   <!-- .NET Standard 2.0 doesn't have the Span<T> and IAsyncEnumerable<T> types -->
diff --git a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>uap10.0.17763</TargetFrameworks>
     <Title>Windows Community Toolkit Devices</Title>
     <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>
-    <PackageTags>UWP Toolkit Windows Devices Bluetooth BluetoothLE BLE Networking</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;Devices;Bluetooth;LE;BluetoothLE;BLE;Networking</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj
@@ -9,7 +9,7 @@
       -FocusTrackerControl : The FocusTracker Control is a feature that can be used to display information about the current focused XAML element.
       -Themes : Provides the source path of the resource dictionaries for the FocusTracker.
     </Description>
-    <PackageTags>UWP Toolkit Windows Controls XAML Developer Tools Accessibility AlignmentGrid</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;Controls;XAML;Developer;Tools;Accessibility;Alignment;Grid;AlignmentGrid</PackageTags>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
   </PropertyGroup>
diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>uap10.0.17134</TargetFramework>
     <Title>Windows Community Toolkit Eye Gaze Library</Title>
     <Description>A library to integrate gaze interactions using eye trackers into UWP applications</Description>
-    <PackageTags>UWP Toolkit Windows Eye Gaze EyeTracker</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;Gaze;Eye;Tracker;EyeTracker</PackageTags>
     <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
   </PropertyGroup>
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotifierCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotifierCompat.cs
@@ -143,10 +143,10 @@ private void PreprocessToast(ToastNotification notification)
             // For apps that don't have identity...
             if (!DesktopBridgeHelpers.HasIdentity())
             {
-                // If tag is specified
-                if (!string.IsNullOrEmpty(notification.Tag))
+                // If tag is specified and group isn't specified
+                if (!string.IsNullOrEmpty(notification.Tag) && string.IsNullOrEmpty(notification.Group))
                 {
-                    // If group isn't specified, we have to add a group since otherwise can't remove without a group
+                    // We have to add a group since otherwise can't remove without a group
                     notification.Group = ToastNotificationManagerCompat.DEFAULT_GROUP;
                 }
             }
@@ -157,10 +157,10 @@ private void PreprocessScheduledToast(ScheduledToastNotification notification)
             // For apps that don't have identity...
             if (!DesktopBridgeHelpers.HasIdentity())
             {
-                // If tag is specified
-                if (!string.IsNullOrEmpty(notification.Tag))
+                // If tag is specified and group isn't specified
+                if (!string.IsNullOrEmpty(notification.Tag) && string.IsNullOrEmpty(notification.Group))
                 {
-                    // If group isn't specified, we have to add a group since otherwise can't remove without a group
+                    // We have to add a group since otherwise can't remove without a group
                     notification.Group = ToastNotificationManagerCompat.DEFAULT_GROUP;
                 }
             }
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
@@ -14,7 +14,7 @@
       - Expressions: ExpressionNodes, ExpressionValues, ReferenceNodes, CompositionExtensions, ExpressionFunctions, OperationType
       - AnimationExtensions: Blur, Fade, Light, Offset, Rotate, Saturation, Scale
     </Description>
-    <PackageTags>UWP Toolkit Windows Animations Composition Connected Implicit XAML</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;Animations;Composition;Connected;Implicit;XAML</PackageTags>
     <LangVersion>9.0</LangVersion>
   </PropertyGroup>
 
diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj b/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj
@@ -14,7 +14,7 @@
       - ViewportBehavior: Listening for element to enter or exit the ScrollViewer viewport
       - FadeHeaderBehavior, QuickReturnHeaderBehavior, StickyHeaderBehavior: Helpers for ListViewBase Header Behavior
     </Description>
-    <PackageTags>UWP Toolkit Windows UI Behaviors XAML</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;UI;Behaviors;Interactivity;Interaction;XAML</PackageTags>
 
     <UseWindowsDesktopSdk>true</UseWindowsDesktopSdk>
   </PropertyGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj
@@ -14,10 +14,24 @@
         - Loading: Helps to show content with animation to the user while the app is doing some calculation.
         - RadialProgressBar: Displays progress as a circle getting filled.
         - RotatorTile: Rotates through a set of items one-by-one like a live-tile.
+        - TabbedCommandBar: A command bar that organizes features of an application into a series of tabs.
         - TextToolbar: A Toolbar for Editing Text attached to a RichEditBox. It can format RTF, Markdown, or use a Custom Formatter.
         - TileControl: A ContentControl that show an image repeated many times.
     </Description>
-    <PackageTags>UWP Toolkit Windows Controls XAML Markdown CameraPreview Camera DropShadow ImageEx InAppNotification InfiniteCanvas Radial RadialProgressBar Scroll ScrollHeader Tile</PackageTags>
+    <PackageTags>
+        Windows;Community;Toolkit;WCT;UWP;Controls;XAML;
+        Camera;Preview     ;CameraPreview    ;
+        Drop;Shadow;Panel  ;DropShadowPanel  ;DropShadow  ;
+        Image;Ex           ;ImageEx          ;
+        In;App;Notification;InAppNotification;InApp       ;
+        Loading            ;
+        Menu               ;
+        Radial;Progress;Bar;RadialProgressBar;ProgressBar ;
+        Rotator;Tile       ;RotatorTile      ;
+        Tabbed;Command;Bar ;TabbedCommandBar ;CommandBar  ;
+        Text;Tool;Bar      ;TextToolBar      ;ToolBar     ;Markdown;
+        Tile;Control       ;TileControl      ;
+    </PackageTags>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
     <LangVersion>9.0</LangVersion>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj
@@ -6,7 +6,7 @@
       This library provides a XAML DataGrid control. It is part of the Windows Community Toolkit.
 
     </Description>
-    <PackageTags>UWP Toolkit Windows Controls XAML DataGrid</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;Controls;XAML;Data;Grid;DataGrid</PackageTags>
     <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj
@@ -13,7 +13,14 @@
         - RemoteDevicePicker: Remote Device Picker Control for Project Rome.
         - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags.
     </Description>
-    <PackageTags>UWP Toolkit Windows Controls XAML Range Radial Gauge RadiaGauge Tokenizing TextBox</PackageTags>
+    <PackageTags>
+        Windows;Community;Toolkit;WCT;UWP;Controls;XAML;
+        Color;Picker;Button ;ColorPickerButton ;ColorPicker ;
+        Radial;Gauge        ;RadialGauge       ;
+        Range;Selector      ;RangeSelector     ;
+        Remote;Device;Picker;RemoteDevicePicker;DevicePicker;RemoteDevice;
+        Tokenizing;Text;Box ;TokenizingTextBox ;TextBox     ;
+    </PackageTags>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
     <LangVersion>8.0</LangVersion>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj
@@ -17,7 +17,18 @@
         - ListDetailsView: Implements the List/Details design pattern.
         - OrbitView: Positions items in a circle around a center element and supports orbits and anchors.
     </Description>
-    <PackageTags>BladeView Blade Carousel Expander GridSplitter HeaderedContent List Details ListDetails Orbit</PackageTags>
+    <PackageTags>
+      Windows;Community;Toolkit;WCT;
+      Blade;View              ;BladeView             ;
+      Carousel                ;
+      Expander                ;
+      Grid;Splitter           ;GridSplitter          ;
+      Headered;Content;Control;HeaderedContentControl;ContentControl ;HeaderedContent;
+      Headered;Items;Control  ;HeaderedItemsControl  ;ItemsControl   ;HeaderedItems  ;
+      Layout;Transform;Control;LayoutTransformControl;LayoutTransform;
+      List;Details;View       ;ListDetailsView       ;ListDetails    ;
+      Orbit;View              ;OrbitView             ;
+    </PackageTags>
     <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
     <LangVersion>8.0</LangVersion>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj
@@ -6,7 +6,7 @@
       This library provides a XAML MarkdownTextBlock control, an efficient and extensible control that can parse and render markdown. It is part of the Windows Community Toolkit.
 
     </Description>
-    <PackageTags>UWP Toolkit Windows Controls XAML Markdown MarkdownTextBlock</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;Controls;XAML;Markdown;Text;Block;MarkdownTextBlock</PackageTags>
     <RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls</RootNamespace>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj
@@ -11,7 +11,12 @@
         - ImageCropper: ImageCropper control allows user to crop image freely.
         - InfiniteCanvas: Supports Infinite Scrolling, Ink, Text, Format Text, Zoom in/out, Redo, Undo, Export &amp; Import.
     </Description>
-    <PackageTags>UWP Toolkit Windows Controls XAML InfiniteCanvas Eyedropper</PackageTags>
+    <PackageTags>
+      Windows;Community;Toolkit;WCT;UWP;Controls;XAML;
+      Eye;Dropper    ;EyeDropper    ;
+      Image;Cropper  ;ImageCropper  ;Crop;
+      Infinite;Canvas;InfiniteCanvas;
+    </PackageTags>
     <!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
     <EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
     <LangVersion>8.0</LangVersion>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj
@@ -9,12 +9,24 @@
 			Controls:
 			- AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space.
 			- DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other.
+			- StaggeredLayout: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
 			- StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
 			- SwitchPresenter: A presenter which can act as a switch statement for layout providing alternate layouts based on a value.
 			- UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space.
+			- WrapLayout: Positions child elements in sequential position from left to right and breaks content to the next line.
 			- WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line.
 		</Description>
-		<PackageTags>UWP Toolkit Windows Controls XAML WrapPanel Adaptive DockPanel StaggeredPanel Staggered SwitchPresenter UniformGrid Uniform Grid</PackageTags>
+		<PackageTags>
+			Windows;Community;Toolkit;WCT;UWP;Controls;XAML;
+			Adaptive;Grid;View;AdaptiveGridView;GridView ;AdaptiveGrid    ;
+			Dock;Panel        ;DockPanel       ;
+			Staggered;Layout  ;StaggeredLayout ;
+			Staggered;Panel   ;StaggeredPanel  ;
+			Switch;Presenter  ;SwitchPresenter ;
+			Uniform;Grid      ;UniformGrid     ;
+			Wrap;Layout       ;WrapLayout      ;
+			Wrap;Panel        ;WrapPanel       ;
+		</PackageTags>
 		<!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
 		<EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
 		<LangVersion>8.0</LangVersion>
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
@@ -39,7 +39,7 @@
       Geometry:
       - CanvasPathGeometry: A class that parses Win2d Path Mini Language and converts it to CanvasGeometry, CanvasBrush, CanvasStroke, CanvasStrokeStyle or Color.
     </Description>
-    <PackageTags>UWP Toolkit Windows UI XAML brushes blur</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;UI;XAML;brushes;blur;effects;animations</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
@@ -39,7 +39,7 @@
       - DependencyPropertyWatcher: Used to Track Changes of a Dependency Property
       - ThemeListener: Class which listens for changes to Application Theme or High Contrast Modes and Signals an Event when they occur.
       </Description>
-    <PackageTags>UWP Toolkit Windows UI Converters XAML extensions helpers</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;UI;Converters;XAML;extensions;helpers</PackageTags>
     <UseWindowsDesktopSdk>true</UseWindowsDesktopSdk>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>uap10.0.17763</TargetFrameworks>
     <Title>Windows Community Toolkit</Title>
     <Description>This package includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc.</Description>
-    <PackageTags>UWP Toolkit Windows</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP</PackageTags>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
diff --git a/Microsoft.Toolkit/Microsoft.Toolkit.csproj b/Microsoft.Toolkit/Microsoft.Toolkit.csproj
@@ -11,7 +11,7 @@
       - IncrementalLoadingCollection: Simplifies the definition and usage of collections whose items can be loaded incrementally only when needed by the view.
       - String extensions and array extensions: These extensions make working with string and arrays easier.
     </Description>
-    <PackageTags>UWP Toolkit Windows IncrementalLoadingCollection String Array extensions helpers</PackageTags>
+    <PackageTags>Windows;Community;Toolkit;WCT;UWP;Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;extensions;helpers</PackageTags>
   </PropertyGroup>
 
   <!-- .NET Standard 1.4 doesn't have the [Pure] attribute -->

Original file line number	Diff line number	Diff line change
`@@ -143,10 +143,10 @@ private void PreprocessToast(ToastNotification notification)`
`143`	`143`	`// For apps that don't have identity...`
`144`	`144`	`if (!DesktopBridgeHelpers.HasIdentity())`
`145`	`145`	`{`
`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))`
`148`	`148`	`{`
`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`
`150`	`150`	`notification.Group = ToastNotificationManagerCompat.DEFAULT_GROUP;`
`151`	`151`	`}`
`152`	`152`	`}`
`@@ -157,10 +157,10 @@ private void PreprocessScheduledToast(ScheduledToastNotification notification)`
`157`	`157`	`// For apps that don't have identity...`
`158`	`158`	`if (!DesktopBridgeHelpers.HasIdentity())`
`159`	`159`	`{`
`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))`
`162`	`162`	`{`
`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`
`164`	`164`	`notification.Group = ToastNotificationManagerCompat.DEFAULT_GROUP;`
`165`	`165`	`}`
`166`	`166`	`}`