From 6fcbb11b464ad8222fb3563adbf7a87d079ab52a Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Tue, 18 Aug 2020 17:28:44 -0700
Subject: [PATCH 01/46] New Notifications code

---
 .../DesktopNotificationActivatedEventArgs.cs  |  24 ++
 .../DesktopNotificationManagerCompat.cs       | 262 ++++++++++++++----
 .../NotificationActivator.cs                  |  12 +-
 .../NotificationUserInput.cs                  |   6 +-
 .../DesktopNotificationManager/OnActivated.cs |   8 +
 ...Microsoft.Toolkit.Uwp.Notifications.csproj |   5 +-
 .../App.xaml                                  |   8 +
 .../App.xaml.cs                               |  39 +++
 .../AssemblyInfo.cs                           |  10 +
 .../MainWindow.xaml                           |  20 ++
 .../MainWindow.xaml.cs                        |  28 ++
 ...oft.Toolkit.Win32.WpfCore.SampleApp.csproj |  13 +
 Windows Community Toolkit.sln                 |  33 +++
 13 files changed, 406 insertions(+), 62 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationActivatedEventArgs.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/OnActivated.cs
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp/AssemblyInfo.cs
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj

diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationActivatedEventArgs.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationActivatedEventArgs.cs
new file mode 100644
index 00000000000..a42329f0b46
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationActivatedEventArgs.cs
@@ -0,0 +1,24 @@
+using Windows.Foundation.Collections;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    /// <summary>
+    /// Provides information about an event that occurs when the app is activated because a user tapped on the body of a toast notification or performed an action inside a toast notification.
+    /// </summary>
+    public class DesktopNotificationActivatedEventArgs
+    {
+        internal DesktopNotificationActivatedEventArgs()
+        {
+        }
+
+        /// <summary>
+        /// Gets the arguments from the toast XML payload related to the action that was invoked on the toast.
+        /// </summary>
+        public string Argument { get; internal set; }
+
+        /// <summary>
+        /// Gets a set of values that you can use to obtain the user input from an interactive toast notification.
+        /// </summary>
+        public ValueSet UserInput { get; internal set; }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
index f70be4537fb..a9afbbcc3a1 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
@@ -4,10 +4,16 @@
 
 using System;
 using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Emit;
 using System.Runtime.InteropServices;
+using System.Security.Cryptography;
 using System.Text;
+using Microsoft.Win32;
+using Windows.Foundation.Collections;
+using Windows.UI;
 using Windows.UI.Notifications;
-using static Microsoft.Toolkit.Uwp.Notifications.NotificationActivator;
 
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
@@ -16,10 +22,40 @@ namespace Microsoft.Toolkit.Uwp.Notifications
     /// </summary>
     public class DesktopNotificationManagerCompat
     {
+        /// <summary>
+        /// Event that is triggered when a notification or notification button is clicked.
+        /// </summary>
+        public static event OnActivated OnActivated;
+
+        internal static void OnActivatedInternal(string args, Internal.NotificationActivator.NOTIFICATION_USER_INPUT_DATA[] input, string aumid)
+        {
+            ValueSet userInput = new ValueSet();
+
+            if (input != null)
+            {
+                foreach (var val in input)
+                {
+                    userInput.Add(val.Key, val.Value);
+                }
+            }
+
+            try
+            {
+                OnActivated?.Invoke(new DesktopNotificationActivatedEventArgs()
+                {
+                    Argument = args,
+                    UserInput = userInput
+                });
+            }
+            catch
+            {
+            }
+        }
+
         /// <summary>
         /// A constant that is used as the launch arg when your EXE is launched from a toast notification.
         /// </summary>
-        public const string ToastActivatedLaunchArg = "-ToastActivated";
+        private const string TOAST_ACTIVATED_LAUNCH_ARG = "-ToastActivated";
 
         private const int CLASS_E_NOAGGREGATION = -2147221232;
         private const int E_NOINTERFACE = -2147467262;
@@ -30,23 +66,57 @@ public class DesktopNotificationManagerCompat
 
         private static bool _registeredAumidAndComServer;
         private static string _aumid;
-        private static bool _registeredActivator;
 
         /// <summary>
-        /// If you're not using MSIX or sparse packages, you must call this method to register your AUMID with the Compat library and to
-        /// register your COM CLSID and EXE in LocalServer32 registry. Feel free to call this regardless, and we will no-op if running
-        /// under Desktop Bridge. Call this upon application startup, before calling any other APIs.
+        /// If you're not using UWP, MSIX, or sparse packages, you must call this method to register your AUMID
+        /// and display assets with the Compat library. Feel free to call this regardless, it will no-op if running
+        /// under MSIX/sparse/UWP. Call this upon application startup (every time), before calling any other APIs.
+        /// Note that the display name and icon will NOT update if changed until either all toasts are cleared,
+        /// or the system is rebooted.
+        /// </summary>
+        /// <param name="aumid">An AUMID that uniquely identifies your application.</param>
+        /// <param name="displayName">Your app's display name, which will appear on toasts and within Action Center.</param>
+        /// <param name="iconPath">Your app's icon, which will appear on toasts and within Action Center.</param>
+        public static void RegisterApplication(
+            string aumid,
+            string displayName,
+            string iconPath)
+        {
+            RegisterApplication(aumid, displayName, iconPath, Colors.LightGray);
+        }
+
+        /// <summary>
+        /// If you're not using UWP, MSIX, or sparse packages, you must call this method to register your AUMID
+        /// and display assets with the Compat library. Feel free to call this regardless, it will no-op if running
+        /// under MSIX/sparse/UWP. Call this upon application startup (every time), before calling any other APIs.
+        /// Note that the display name and icon will NOT update if changed until either all toasts are cleared,
+        /// or the system is rebooted.
         /// </summary>
-        /// <typeparam name="T">Your implementation of NotificationActivator. Must have GUID and ComVisible attributes on class.</typeparam>
         /// <param name="aumid">An AUMID that uniquely identifies your application.</param>
-        public static void RegisterAumidAndComServer<T>(string aumid)
-            where T : NotificationActivator
+        /// <param name="displayName">Your app's display name, which will appear on toasts and within Action Center.</param>
+        /// <param name="iconPath">Your app's icon, which will appear on toasts and within Action Center.</param>
+        /// <param name="iconBackgroundColor">Your app's icon background color, which only appears in the system notification settings page (everywhere else your icon will have a transparent background). If you use the method without this parameter, we'll use light gray (which should look good on most icons). To use the accent color, pass in null for this parameter.</param>
+        public static void RegisterApplication(
+            string aumid,
+            string displayName,
+            string iconPath,
+            Color iconBackgroundColor)
         {
             if (string.IsNullOrWhiteSpace(aumid))
             {
                 throw new ArgumentException("You must provide an AUMID.", nameof(aumid));
             }
 
+            if (string.IsNullOrWhiteSpace(displayName))
+            {
+                throw new ArgumentException("You must provide a display name.", nameof(displayName));
+            }
+
+            if (string.IsNullOrWhiteSpace(iconPath))
+            {
+                throw new ArgumentException("You must provide an icon path.", nameof(iconPath));
+            }
+
             // If running as Desktop Bridge
             if (DesktopBridgeHelpers.IsRunningAsUwp())
             {
@@ -60,46 +130,145 @@ public static void RegisterAumidAndComServer<T>(string aumid)
 
             _aumid = aumid;
 
-            string exePath = Process.GetCurrentProcess().MainModule.FileName;
-            RegisterComServer<T>(exePath);
+            using (var rootKey = Registry.CurrentUser.CreateSubKey(@"Software\Classes\AppUserModelId\" + aumid))
+            {
+                rootKey.SetValue("DisplayName", displayName);
+                rootKey.SetValue("IconUri", iconPath);
+
+                // Background color only appears in the settings page, format is
+                // hex without leading #, like "FFDDDDDD"
+                if (iconBackgroundColor == null)
+                {
+                    rootKey.DeleteValue("IconBackgroundColor");
+                }
+                else
+                {
+                    rootKey.SetValue("IconBackgroundColor", $"{iconBackgroundColor.A:X2}{iconBackgroundColor.R:X2}{iconBackgroundColor.G:X2}{iconBackgroundColor.B:X2}");
+                }
+            }
 
             _registeredAumidAndComServer = true;
+
+            // https://stackoverflow.com/questions/24069352/c-sharp-typebuilder-generate-class-with-function-dynamically
+            // For .NET Core we're going to need https://stackoverflow.com/questions/36937276/is-there-any-replace-of-assemblybuilder-definedynamicassembly-in-net-core
+            AssemblyName aName = new AssemblyName("DynamicComActivator");
+            AssemblyBuilder aBuilder = AssemblyBuilder.DefineDynamicAssembly(aName, AssemblyBuilderAccess.Run);
+
+            // For a single-module assembly, the module name is usually the assembly name plus an extension.
+            ModuleBuilder mb = aBuilder.DefineDynamicModule(aName.Name);
+
+            // Create class which extends NotificationActivator
+            TypeBuilder tb = mb.DefineType(
+                name: "MyNotificationActivator",
+                attr: TypeAttributes.Public,
+                parent: typeof(Internal.NotificationActivator),
+                interfaces: new Type[0]);
+
+            tb.SetCustomAttribute(new CustomAttributeBuilder(
+                con: typeof(GuidAttribute).GetConstructor(new Type[] { typeof(string) }),
+                constructorArgs: new object[] { GenerateGuid(aumid) }));
+
+            tb.SetCustomAttribute(new CustomAttributeBuilder(
+                con: typeof(ComVisibleAttribute).GetConstructor(new Type[] { typeof(bool) }),
+                constructorArgs: new object[] { true }));
+
+            tb.SetCustomAttribute(new CustomAttributeBuilder(
+#pragma warning disable CS0618 // Type or member is obsolete
+                con: typeof(ComSourceInterfacesAttribute).GetConstructor(new Type[] { typeof(Type) }),
+#pragma warning restore CS0618 // Type or member is obsolete
+                constructorArgs: new object[] { typeof(Internal.NotificationActivator.INotificationActivationCallback) }));
+
+            tb.SetCustomAttribute(new CustomAttributeBuilder(
+                con: typeof(ClassInterfaceAttribute).GetConstructor(new Type[] { typeof(ClassInterfaceType) }),
+                constructorArgs: new object[] { ClassInterfaceType.None }));
+
+            var activatorType = tb.CreateType();
+
+            RegisterActivator(activatorType);
         }
 
-        private static void RegisterComServer<T>(string exePath)
-            where T : NotificationActivator
+        /// <summary>
+        /// From https://stackoverflow.com/a/41622689/1454643
+        /// Generates Guid based on String. Key assumption for this algorithm is that name is unique (across where it it's being used)
+        /// and if name byte length is less than 16 - it will be fetched directly into guid, if over 16 bytes - then we compute sha-1
+        /// hash from string and then pass it to guid.
+        /// </summary>
+        /// <param name="name">Unique name which is unique across where this guid will be used.</param>
+        /// <returns>For example "706C7567-696E-7300-0000-000000000000" for "plugins"</returns>
+        private static string GenerateGuid(string name)
         {
-            // We register the EXE to start up when the notification is activated
-            string regString = string.Format("SOFTWARE\\Classes\\CLSID\\{{{0}}}\\LocalServer32", typeof(T).GUID);
-            var key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(regString);
+            byte[] buf = Encoding.UTF8.GetBytes(name);
+            byte[] guid = new byte[16];
+            if (buf.Length < 16)
+            {
+                Array.Copy(buf, guid, buf.Length);
+            }
+            else
+            {
+                using (SHA1 sha1 = SHA1.Create())
+                {
+                    byte[] hash = sha1.ComputeHash(buf);
 
-            // Include a flag so we know this was a toast activation and should wait for COM to process
-            // We also wrap EXE path in quotes for extra security
-            key.SetValue(null, '"' + exePath + '"' + " " + ToastActivatedLaunchArg);
-        }
+                    // Hash is 20 bytes, but we need 16. We loose some of "uniqueness", but I doubt it will be fatal
+                    Array.Copy(hash, guid, 16);
+                }
+            }
 
-        /*
-        * RegisterActivator code and all internal dependencies is from FrecherxDachs.
-        * See entry #2 in ThirdPartyNotices.txt in root repository directory for full license. */
+            // Don't use Guid constructor, it tends to swap bytes. We want to preserve original string as hex dump.
+            string guidS = $"{guid[0]:X2}{guid[1]:X2}{guid[2]:X2}{guid[3]:X2}-{guid[4]:X2}{guid[5]:X2}-{guid[6]:X2}{guid[7]:X2}-{guid[8]:X2}{guid[9]:X2}-{guid[10]:X2}{guid[11]:X2}{guid[12]:X2}{guid[13]:X2}{guid[14]:X2}{guid[15]:X2}";
+
+            return guidS;
+        }
 
         /// <summary>
-        /// Registers the activator type as a COM server client so that Windows can launch your activator.
+        /// Registers the activator type as a COM server client so that Windows can launch your activator. If not using UWP/MSIX/sparse, you must call <see cref="RegisterApplication(string, string, string)"/> first.
         /// </summary>
-        /// <typeparam name="T">Your implementation of NotificationActivator. Must have GUID and ComVisible attributes on class.</typeparam>
-        public static void RegisterActivator<T>()
-            where T : NotificationActivator, new()
+        private static void RegisterActivator(Type activatorType)
         {
+            if (!DesktopBridgeHelpers.IsRunningAsUwp())
+            {
+                if (_aumid == null)
+                {
+                    throw new InvalidOperationException("You must call RegisterApplication first.");
+                }
+
+                string exePath = Process.GetCurrentProcess().MainModule.FileName;
+                RegisterComServer(activatorType, exePath);
+
+                using (var rootKey = Registry.CurrentUser.CreateSubKey(@"Software\Classes\AppUserModelId\" + _aumid))
+                {
+                    rootKey.SetValue("CustomActivator", string.Format("{{{0}}}", activatorType.GUID));
+                }
+            }
+
             // Big thanks to FrecherxDachs for figuring out the following code which works in .NET Core 3: https://github.com/FrecherxDachs/UwpNotificationNetCoreTest
-            var uuid = typeof(T).GUID;
-            uint cookie;
+            var uuid = activatorType.GUID;
             CoRegisterClassObject(
                 uuid,
-                new NotificationActivatorClassFactory<T>(),
+                new NotificationActivatorClassFactory(activatorType),
                 CLSCTX_LOCAL_SERVER,
                 REGCLS_MULTIPLEUSE,
-                out cookie);
+                out _);
+        }
+
+        private static void RegisterComServer(Type activatorType, string exePath)
+        {
+            // We register the EXE to start up when the notification is activated
+            string regString = string.Format("SOFTWARE\\Classes\\CLSID\\{{{0}}}\\LocalServer32", activatorType.GUID);
+            var key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(regString);
+
+            // Include a flag so we know this was a toast activation and should wait for COM to process
+            // We also wrap EXE path in quotes for extra security
+            key.SetValue(null, '"' + exePath + '"' + " " + TOAST_ACTIVATED_LAUNCH_ARG);
+        }
 
-            _registeredActivator = true;
+        /// <summary>
+        /// Gets whether the current process was activated due to a toast activation. If so, the OnActivated event will be triggered soon after process launch.
+        /// </summary>
+        /// <returns>True if the current process was activated due to a toast activation, otherwise false.</returns>
+        public static bool WasProcessToastActivated()
+        {
+            return Environment.GetCommandLineArgs().Contains(TOAST_ACTIVATED_LAUNCH_ARG);
         }
 
         [ComImport]
@@ -114,9 +283,15 @@ private interface IClassFactory
             int LockServer(bool fLock);
         }
 
-        private class NotificationActivatorClassFactory<T> : IClassFactory
-            where T : NotificationActivator, new()
+        private class NotificationActivatorClassFactory : IClassFactory
         {
+            private Type _activatorType;
+
+            public NotificationActivatorClassFactory(Type activatorType)
+            {
+                _activatorType = activatorType;
+            }
+
             public int CreateInstance(IntPtr pUnkOuter, ref Guid riid, out IntPtr ppvObject)
             {
                 ppvObject = IntPtr.Zero;
@@ -126,12 +301,12 @@ public int CreateInstance(IntPtr pUnkOuter, ref Guid riid, out IntPtr ppvObject)
                     Marshal.ThrowExceptionForHR(CLASS_E_NOAGGREGATION);
                 }
 
-                if (riid == typeof(T).GUID || riid == IUnknownGuid)
+                if (riid == _activatorType.GUID || riid == IUnknownGuid)
                 {
                     // Create the instance of the .NET object
                     ppvObject = Marshal.GetComInterfaceForObject(
-                        new T(),
-                        typeof(INotificationActivationCallback));
+                        Activator.CreateInstance(_activatorType),
+                        typeof(Internal.NotificationActivator.INotificationActivationCallback));
                 }
                 else
                 {
@@ -158,7 +333,7 @@ private static extern int CoRegisterClassObject(
             out uint lpdwRegister);
 
         /// <summary>
-        /// Creates a toast notifier. You must have called <see cref="RegisterActivator{T}"/> first (and also <see cref="RegisterAumidAndComServer(string)"/> if you're a classic Win32 app), or this will throw an exception.
+        /// Creates a toast notifier. If you're a Win32 non-MSIX/sparse app, you must have called <see cref="RegisterApplication(string, string, string)"/> first), or this will throw an exception.
         /// </summary>
         /// <returns><see cref="ToastNotifier"/></returns>
         public static ToastNotifier CreateToastNotifier()
@@ -178,7 +353,7 @@ public static ToastNotifier CreateToastNotifier()
         }
 
         /// <summary>
-        /// Gets the <see cref="DesktopNotificationHistoryCompat"/> object. You must have called <see cref="RegisterActivator{T}"/> first (and also <see cref="RegisterAumidAndComServer(string)"/> if you're a classic Win32 app), or this will throw an exception.
+        /// Gets the <see cref="DesktopNotificationHistoryCompat"/> object. If you're a Win32 non-MISX/sparse app, you must call <see cref="RegisterApplication(string, string, string)"/> first, or this will throw an exception.
         /// </summary>
         public static DesktopNotificationHistoryCompat History
         {
@@ -204,16 +379,9 @@ private static void EnsureRegistered()
                 else
                 {
                     // Otherwise, incorrect usage
-                    throw new Exception("You must call RegisterAumidAndComServer first.");
+                    throw new Exception($"You must call {nameof(RegisterApplication)} first.");
                 }
             }
-
-            // If not registered activator yet
-            if (!_registeredActivator)
-            {
-                // Incorrect usage
-                throw new Exception("You must call RegisterActivator first.");
-            }
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationActivator.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationActivator.cs
index b8cf3c8ae27..0946b2be610 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationActivator.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationActivator.cs
@@ -11,7 +11,7 @@
 using System.Text;
 using Windows.UI.Notifications;
 
-namespace Microsoft.Toolkit.Uwp.Notifications
+namespace Microsoft.Toolkit.Uwp.Notifications.Internal
 {
     /// <summary>
     /// Apps must implement this activator to handle notification activation.
@@ -21,17 +21,9 @@ public abstract class NotificationActivator : NotificationActivator.INotificatio
         /// <inheritdoc/>
         public void Activate(string appUserModelId, string invokedArgs, NOTIFICATION_USER_INPUT_DATA[] data, uint dataCount)
         {
-            OnActivated(invokedArgs, new NotificationUserInput(data), appUserModelId);
+            DesktopNotificationManagerCompat.OnActivatedInternal(invokedArgs, data, appUserModelId);
         }
 
-        /// <summary>
-        /// This method will be called when the user clicks on a foreground or background activation on a toast. Parent app must implement this method.
-        /// </summary>
-        /// <param name="arguments">The arguments from the original notification. This is either the launch argument if the user clicked the body of your toast, or the arguments from a button on your toast.</param>
-        /// <param name="userInput">Text and selection values that the user entered in your toast.</param>
-        /// <param name="appUserModelId">Your AUMID.</param>
-        public abstract void OnActivated(string arguments, NotificationUserInput userInput, string appUserModelId);
-
         /// <summary>
         /// A single user input key/value pair.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationUserInput.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationUserInput.cs
index 0ef54e3ec39..25f7b6b3e0f 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationUserInput.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationUserInput.cs
@@ -16,11 +16,11 @@ namespace Microsoft.Toolkit.Uwp.Notifications
     /// <summary>
     /// Text and selection values that the user entered on your notification. The Key is the ID of the input, and the Value is what the user entered.
     /// </summary>
-    public class NotificationUserInput : IReadOnlyDictionary<string, string>
+    internal class NotificationUserInput : IReadOnlyDictionary<string, string>
     {
-        private NotificationActivator.NOTIFICATION_USER_INPUT_DATA[] _data;
+        private Internal.NotificationActivator.NOTIFICATION_USER_INPUT_DATA[] _data;
 
-        internal NotificationUserInput(NotificationActivator.NOTIFICATION_USER_INPUT_DATA[] data)
+        internal NotificationUserInput(Internal.NotificationActivator.NOTIFICATION_USER_INPUT_DATA[] data)
         {
             _data = data;
         }
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/OnActivated.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/OnActivated.cs
new file mode 100644
index 00000000000..0b2142ca2e2
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/OnActivated.cs
@@ -0,0 +1,8 @@
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    /// <summary>
+    /// Event triggered when a notification is clicked.
+    /// </summary>
+    /// <param name="e">Arguments that specify what action was taken and the user inputs.</param>
+    public delegate void OnActivated(DesktopNotificationActivatedEventArgs e);
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index 1c08ba0f600..3e72883b2ff 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.4;uap10.0;native;net461;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netstandard1.4;uap10.0;native;net461;netcoreapp3.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
     <Title>Windows Community Toolkit Notifications</Title>
     <Description>
@@ -39,9 +39,10 @@
 
   </Choose>
 
-  <!--NET Core desktop apps also need the Registry NuGet package-->
+  <!--NET Core desktop apps also need the Registry NuGet package and System.Reflection.Emit for generating COM class dynamically-->
   <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.0'">
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
   </ItemGroup>
   
   <ItemGroup Condition=" '$(TargetFramework)' == 'native' ">
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml
new file mode 100644
index 00000000000..8cde026f920
--- /dev/null
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml
@@ -0,0 +1,8 @@
+<Application x:Class="Microsoft.Toolkit.Win32.WpfCore.SampleApp.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Microsoft.Toolkit.Win32.WpfCore.SampleApp">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
new file mode 100644
index 00000000000..1683e82d10e
--- /dev/null
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Windows;
+using Microsoft.Toolkit.Uwp.Notifications;
+
+namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            // Register the app to support toast notifications
+            DesktopNotificationManagerCompat.RegisterApplication(
+                aumid: "Microsoft.Toolkit.Win32.WpfCore",
+                displayName: "Toolkit Win32 WPF Core Sample App",
+                iconPath: "C:\\icon.png");
+
+            // And listen to toast notification activations
+            DesktopNotificationManagerCompat.OnActivated += this.DesktopNotificationManagerCompat_OnActivated;
+
+            if (!DesktopNotificationManagerCompat.WasProcessToastActivated())
+            {
+                new MainWindow().Show();
+            }
+        }
+
+        private void DesktopNotificationManagerCompat_OnActivated(DesktopNotificationActivatedEventArgs e)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                var args = e.Argument;
+                var userInputCount = e.UserInput.Count;
+                MessageBox.Show("Activated!");
+            });
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/AssemblyInfo.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/AssemblyInfo.cs
new file mode 100644
index 00000000000..8b5504ecfbb
--- /dev/null
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/AssemblyInfo.cs
@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml
new file mode 100644
index 00000000000..a86aa2968f1
--- /dev/null
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml
@@ -0,0 +1,20 @@
+<Window x:Class="Microsoft.Toolkit.Win32.WpfCore.SampleApp.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Microsoft.Toolkit.Win32.WpfCore.SampleApp"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="450" Width="800">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <Button
+            x:Name="ButtonShowToast"
+            Content="Show toast"
+            Click="ButtonShowToast_Click"/>
+    </Grid>
+</Window>
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
new file mode 100644
index 00000000000..c317404c785
--- /dev/null
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
@@ -0,0 +1,28 @@
+using System.Windows;
+using Microsoft.Toolkit.Uwp.Notifications;
+using Windows.UI.Notifications;
+
+namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void ButtonShowToast_Click(object sender, RoutedEventArgs e)
+        {
+            var content = new ToastContentBuilder()
+                .AddText("Hello from WPF!")
+                .GetToastContent();
+
+            var notif = new ToastNotification(content.GetXml());
+
+            DesktopNotificationManagerCompat.CreateToastNotifier().Show(notif);
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
new file mode 100644
index 00000000000..560352b068c
--- /dev/null
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp.Notifications\Microsoft.Toolkit.Uwp.Notifications.csproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index d8e5f4ccbee..b1f81ebd7e0 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -125,6 +125,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{88C6FFBE-3
 		ThirdPartyNotices.txt = ThirdPartyNotices.txt
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Win32.WpfCore.SampleApp", "Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj", "{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{4e9466d1-d5aa-46ac-801b-c8fdab79f0d4}*SharedItemsImports = 13
@@ -1085,6 +1087,36 @@ Global
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.ActiveCfg = Release|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.Build.0 = Release|x86
 		{804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.Deploy.0 = Release|x86
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|ARM.Build.0 = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x64.Build.0 = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x86.Build.0 = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|Any CPU.ActiveCfg = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|Any CPU.Build.0 = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM.ActiveCfg = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM.Build.0 = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM64.ActiveCfg = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM64.Build.0 = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x64.ActiveCfg = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x64.Build.0 = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x86.ActiveCfg = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x86.Build.0 = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.Build.0 = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM64.Build.0 = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x64.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x64.Build.0 = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x86.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1120,6 +1152,7 @@ Global
 		{C79029AF-2E9B-4466-BAC4-1A41B281EAE6} = {B30036C4-D514-4E5B-A323-587A061772CE}
 		{804D0681-52F6-4E61-864A-699F0AB44B20} = {C79029AF-2E9B-4466-BAC4-1A41B281EAE6}
 		{88C6FFBE-322D-4CEA-842B-B2CB281D357D} = {CFA75BE0-5A44-45DE-8114-426A605B062B}
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405} = {9AD30620-667D-433C-9961-8D885EE7B762}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}

From 1518f2820a0664c004b920851779be6c320e8945 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 20 Aug 2020 17:25:42 -0700
Subject: [PATCH 02/46] Auto register!

---
 .../DesktopNotificationActivatedEventArgs.cs  |   4 +
 .../DesktopNotificationManagerCompat.cs       | 166 ++++++------------
 .../DesktopNotificationManager/OnActivated.cs |   4 +
 .../App.xaml.cs                               |  13 +-
 .../AssemblyInfo.cs                           |  14 +-
 .../MainWindow.xaml.cs                        |   6 +-
 6 files changed, 83 insertions(+), 124 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationActivatedEventArgs.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationActivatedEventArgs.cs
index a42329f0b46..99efec211f7 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationActivatedEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationActivatedEventArgs.cs
@@ -1,3 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
 using Windows.Foundation.Collections;
 
 namespace Microsoft.Toolkit.Uwp.Notifications
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
index a9afbbcc3a1..cdcc35e7a4d 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
@@ -4,13 +4,17 @@
 
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
+using System.Text.RegularExpressions;
 using Microsoft.Win32;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Resources;
 using Windows.Foundation.Collections;
 using Windows.UI;
 using Windows.UI.Notifications;
@@ -64,71 +68,48 @@ internal static void OnActivatedInternal(string args, Internal.NotificationActiv
         private const int S_OK = 0;
         private static readonly Guid IUnknownGuid = new Guid("00000000-0000-0000-C000-000000000046");
 
-        private static bool _registeredAumidAndComServer;
         private static string _aumid;
 
-        /// <summary>
-        /// If you're not using UWP, MSIX, or sparse packages, you must call this method to register your AUMID
-        /// and display assets with the Compat library. Feel free to call this regardless, it will no-op if running
-        /// under MSIX/sparse/UWP. Call this upon application startup (every time), before calling any other APIs.
-        /// Note that the display name and icon will NOT update if changed until either all toasts are cleared,
-        /// or the system is rebooted.
-        /// </summary>
-        /// <param name="aumid">An AUMID that uniquely identifies your application.</param>
-        /// <param name="displayName">Your app's display name, which will appear on toasts and within Action Center.</param>
-        /// <param name="iconPath">Your app's icon, which will appear on toasts and within Action Center.</param>
-        public static void RegisterApplication(
-            string aumid,
-            string displayName,
-            string iconPath)
+        static DesktopNotificationManagerCompat()
         {
-            RegisterApplication(aumid, displayName, iconPath, Colors.LightGray);
+            Initialize();
         }
 
-        /// <summary>
-        /// If you're not using UWP, MSIX, or sparse packages, you must call this method to register your AUMID
-        /// and display assets with the Compat library. Feel free to call this regardless, it will no-op if running
-        /// under MSIX/sparse/UWP. Call this upon application startup (every time), before calling any other APIs.
-        /// Note that the display name and icon will NOT update if changed until either all toasts are cleared,
-        /// or the system is rebooted.
-        /// </summary>
-        /// <param name="aumid">An AUMID that uniquely identifies your application.</param>
-        /// <param name="displayName">Your app's display name, which will appear on toasts and within Action Center.</param>
-        /// <param name="iconPath">Your app's icon, which will appear on toasts and within Action Center.</param>
-        /// <param name="iconBackgroundColor">Your app's icon background color, which only appears in the system notification settings page (everywhere else your icon will have a transparent background). If you use the method without this parameter, we'll use light gray (which should look good on most icons). To use the accent color, pass in null for this parameter.</param>
-        public static void RegisterApplication(
-            string aumid,
-            string displayName,
-            string iconPath,
-            Color iconBackgroundColor)
+        private static void Initialize()
         {
-            if (string.IsNullOrWhiteSpace(aumid))
-            {
-                throw new ArgumentException("You must provide an AUMID.", nameof(aumid));
-            }
+            string aumid;
 
-            if (string.IsNullOrWhiteSpace(displayName))
+            if (DesktopBridgeHelpers.IsRunningAsUwp())
             {
-                throw new ArgumentException("You must provide a display name.", nameof(displayName));
+                aumid = Package.Current.Id.FamilyName;
             }
-
-            if (string.IsNullOrWhiteSpace(iconPath))
+            else
             {
-                throw new ArgumentException("You must provide an icon path.", nameof(iconPath));
+                // Win32 apps are uniquely identified based on their process name
+                aumid = GetAumidFromCurrentProcess(Process.GetCurrentProcess());
+
+                // Store the AUMID for Win32 apps since it'll be needed later
+                _aumid = aumid;
             }
 
+            // Create and register activator
+            var activatorType = CreateActivatorType(aumid);
+            RegisterActivator(activatorType);
+
             // If running as Desktop Bridge
             if (DesktopBridgeHelpers.IsRunningAsUwp())
             {
-                // Clear the AUMID since Desktop Bridge doesn't use it, and then we're done.
-                // Desktop Bridge apps are registered with platform through their manifest.
-                // Their LocalServer32 key is also registered through their manifest.
-                _aumid = null;
-                _registeredAumidAndComServer = true;
+                // No need to do anything additional, already registered
                 return;
             }
 
-            _aumid = aumid;
+            // Otherwise, register via registry
+            var currProcess = Process.GetCurrentProcess();
+
+            // Win32 app display names come from their process name
+            string displayName = GetDisplayNameFromCurrentProcess(currProcess);
+
+            string iconPath = "C:\\icon.png"; // TODO: Need to grab icon from process name
 
             using (var rootKey = Registry.CurrentUser.CreateSubKey(@"Software\Classes\AppUserModelId\" + aumid))
             {
@@ -137,18 +118,34 @@ public static void RegisterApplication(
 
                 // Background color only appears in the settings page, format is
                 // hex without leading #, like "FFDDDDDD"
-                if (iconBackgroundColor == null)
-                {
-                    rootKey.DeleteValue("IconBackgroundColor");
-                }
-                else
-                {
-                    rootKey.SetValue("IconBackgroundColor", $"{iconBackgroundColor.A:X2}{iconBackgroundColor.R:X2}{iconBackgroundColor.G:X2}{iconBackgroundColor.B:X2}");
-                }
+                rootKey.SetValue("IconBackgroundColor", "FFDDDDDD");
+
+                rootKey.SetValue("CustomActivator", string.Format("{{{0}}}", activatorType.GUID));
             }
+        }
+
+        private static string GetAumidFromCurrentProcess(Process process)
+        {
+            // TODO: Should actually do the following which is what Shell does...
+            // 1) check for a matching shortcut in a few designated folders; if there is a shortcut, check if the app developer specified an explicit app ID on it (there is also a bunch of logic to dedupe these shortcuts across different folders). 2) if there is no matching shortcut or if no expliit app id was provided on the shortcut that was found, appresolver generates an ID for the item.
+            // This generated app ID is either 1) the path to the exe if there are no launch arguments or 2) a GUID if there are launch arguments
+            // the GUID is a hash of the exe path, launch args, and maybe display name (i'd have to double check)
+
+            // Temporarily we'll just use a hash of the file name
+            return process.MainModule.FileName.GetHashCode().ToString();
+        }
 
-            _registeredAumidAndComServer = true;
+        private static string GetDisplayNameFromCurrentProcess(Process process)
+        {
+            // TODO: Should actually do the following which is what Shell does...
+            // They look for the AppResolver shortcut first and use that, otherwise they pull it from the EXE
 
+            // Temporarily we'll just use the process name
+            return process.ProcessName;
+        }
+
+        private static Type CreateActivatorType(string aumid)
+        {
             // https://stackoverflow.com/questions/24069352/c-sharp-typebuilder-generate-class-with-function-dynamically
             // For .NET Core we're going to need https://stackoverflow.com/questions/36937276/is-there-any-replace-of-assemblybuilder-definedynamicassembly-in-net-core
             AssemblyName aName = new AssemblyName("DynamicComActivator");
@@ -182,9 +179,7 @@ public static void RegisterApplication(
                 con: typeof(ClassInterfaceAttribute).GetConstructor(new Type[] { typeof(ClassInterfaceType) }),
                 constructorArgs: new object[] { ClassInterfaceType.None }));
 
-            var activatorType = tb.CreateType();
-
-            RegisterActivator(activatorType);
+            return tb.CreateType();
         }
 
         /// <summary>
@@ -220,25 +215,12 @@ private static string GenerateGuid(string name)
             return guidS;
         }
 
-        /// <summary>
-        /// Registers the activator type as a COM server client so that Windows can launch your activator. If not using UWP/MSIX/sparse, you must call <see cref="RegisterApplication(string, string, string)"/> first.
-        /// </summary>
         private static void RegisterActivator(Type activatorType)
         {
             if (!DesktopBridgeHelpers.IsRunningAsUwp())
             {
-                if (_aumid == null)
-                {
-                    throw new InvalidOperationException("You must call RegisterApplication first.");
-                }
-
                 string exePath = Process.GetCurrentProcess().MainModule.FileName;
                 RegisterComServer(activatorType, exePath);
-
-                using (var rootKey = Registry.CurrentUser.CreateSubKey(@"Software\Classes\AppUserModelId\" + _aumid))
-                {
-                    rootKey.SetValue("CustomActivator", string.Format("{{{0}}}", activatorType.GUID));
-                }
             }
 
             // Big thanks to FrecherxDachs for figuring out the following code which works in .NET Core 3: https://github.com/FrecherxDachs/UwpNotificationNetCoreTest
@@ -333,13 +315,11 @@ private static extern int CoRegisterClassObject(
             out uint lpdwRegister);
 
         /// <summary>
-        /// Creates a toast notifier. If you're a Win32 non-MSIX/sparse app, you must have called <see cref="RegisterApplication(string, string, string)"/> first), or this will throw an exception.
+        /// Creates a toast notifier.
         /// </summary>
         /// <returns><see cref="ToastNotifier"/></returns>
         public static ToastNotifier CreateToastNotifier()
         {
-            EnsureRegistered();
-
             if (_aumid != null)
             {
                 // Non-Desktop Bridge
@@ -353,44 +333,14 @@ public static ToastNotifier CreateToastNotifier()
         }
 
         /// <summary>
-        /// Gets the <see cref="DesktopNotificationHistoryCompat"/> object. If you're a Win32 non-MISX/sparse app, you must call <see cref="RegisterApplication(string, string, string)"/> first, or this will throw an exception.
+        /// Gets the <see cref="DesktopNotificationHistoryCompat"/> object.
         /// </summary>
-        public static DesktopNotificationHistoryCompat History
-        {
-            get
-            {
-                EnsureRegistered();
-
-                return new DesktopNotificationHistoryCompat(_aumid);
-            }
-        }
-
-        private static void EnsureRegistered()
-        {
-            // If not registered AUMID yet
-            if (!_registeredAumidAndComServer)
-            {
-                // Check if Desktop Bridge
-                if (DesktopBridgeHelpers.IsRunningAsUwp())
-                {
-                    // Implicitly registered, all good!
-                    _registeredAumidAndComServer = true;
-                }
-                else
-                {
-                    // Otherwise, incorrect usage
-                    throw new Exception($"You must call {nameof(RegisterApplication)} first.");
-                }
-            }
-        }
+        public static DesktopNotificationHistoryCompat History => new DesktopNotificationHistoryCompat(_aumid);
 
         /// <summary>
         /// Gets a value indicating whether http images can be used within toasts. This is true if running with package identity (MSIX or sparse package).
         /// </summary>
-        public static bool CanUseHttpImages
-        {
-            get { return DesktopBridgeHelpers.IsRunningAsUwp(); }
-        }
+        public static bool CanUseHttpImages => DesktopBridgeHelpers.IsRunningAsUwp();
 
         /// <summary>
         /// Code from https://github.com/qmatteoq/DesktopBridgeHelpers/edit/master/DesktopBridge.Helpers/Helpers.cs
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/OnActivated.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/OnActivated.cs
index 0b2142ca2e2..c0d4a6c64a5 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/OnActivated.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/OnActivated.cs
@@ -1,3 +1,7 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
     /// <summary>
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
index 1683e82d10e..431094222ce 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
@@ -1,4 +1,7 @@
-using System;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
 using System.Windows;
 using Microsoft.Toolkit.Uwp.Notifications;
 
@@ -11,13 +14,7 @@ public partial class App : Application
     {
         protected override void OnStartup(StartupEventArgs e)
         {
-            // Register the app to support toast notifications
-            DesktopNotificationManagerCompat.RegisterApplication(
-                aumid: "Microsoft.Toolkit.Win32.WpfCore",
-                displayName: "Toolkit Win32 WPF Core Sample App",
-                iconPath: "C:\\icon.png");
-
-            // And listen to toast notification activations
+            // Listen to toast notification activations
             DesktopNotificationManagerCompat.OnActivated += this.DesktopNotificationManagerCompat_OnActivated;
 
             if (!DesktopNotificationManagerCompat.WasProcessToastActivated())
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/AssemblyInfo.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/AssemblyInfo.cs
index 8b5504ecfbb..0f6e98fda31 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/AssemblyInfo.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/AssemblyInfo.cs
@@ -1,10 +1,10 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
 using System.Windows;
 
 [assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
-)]
+    ResourceDictionaryLocation.None, // where theme specific resource dictionaries are located (used if a resource is not found in the page, or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly) // where the generic resource dictionary is located (used if a resource is not found in the page, app, or any theme specific resource dictionaries)
+]
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
index c317404c785..8702dfb3781 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
@@ -1,4 +1,8 @@
-using System.Windows;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Windows;
 using Microsoft.Toolkit.Uwp.Notifications;
 using Windows.UI.Notifications;
 

From 236d1e3f4d3a85a603454bf432b0e7de3521e57a Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 20 Aug 2020 19:03:44 -0700
Subject: [PATCH 03/46] Works for Desktop Bridge!

---
 .../DesktopNotificationManagerCompat.cs       | 132 +++++++++++++++---
 .../Images/LockScreenLogo.scale-200.png       | Bin 0 -> 1430 bytes
 .../Images/SplashScreen.scale-200.png         | Bin 0 -> 7700 bytes
 .../Images/Square150x150Logo.scale-200.png    | Bin 0 -> 2937 bytes
 .../Images/Square44x44Logo.scale-200.png      | Bin 0 -> 1647 bytes
 ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 1255 bytes
 .../Images/StoreLogo.png                      | Bin 0 -> 1451 bytes
 .../Images/Wide310x150Logo.scale-200.png      | Bin 0 -> 3204 bytes
 ...WpfCore.SampleApp.PackagingProject.wapproj |  80 +++++++++++
 .../Package.appxmanifest                      |  69 +++++++++
 .../App.xaml.cs                               |   2 +-
 Windows Community Toolkit.sln                 |  55 +++++++-
 12 files changed, 310 insertions(+), 28 deletions(-)
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/LockScreenLogo.scale-200.png
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/SplashScreen.scale-200.png
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square150x150Logo.scale-200.png
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square44x44Logo.scale-200.png
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square44x44Logo.targetsize-24_altform-unplated.png
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/StoreLogo.png
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Wide310x150Logo.scale-200.png
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Package.appxmanifest

diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
index cdcc35e7a4d..c80e0f8468f 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -12,6 +13,7 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Xml;
 using Microsoft.Win32;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Resources;
@@ -26,10 +28,35 @@ namespace Microsoft.Toolkit.Uwp.Notifications
     /// </summary>
     public class DesktopNotificationManagerCompat
     {
+        private static bool _registeredOnActivated;
+        private static List<OnActivated> _onActivated = new List<OnActivated>();
         /// <summary>
         /// Event that is triggered when a notification or notification button is clicked.
         /// </summary>
-        public static event OnActivated OnActivated;
+        public static event OnActivated OnActivated
+        {
+            add
+            {
+                lock (_onActivated)
+                {
+                    if (!_registeredOnActivated)
+                    {
+                        // Desktop Bridge apps will dynamically register upon first subscription to event
+                        CreateAndRegisterActivator();
+                    }
+
+                    _onActivated.Add(value);
+                }
+            }
+
+            remove
+            {
+                lock (_onActivated)
+                {
+                    _onActivated.Remove(value);
+                }
+            }
+        }
 
         internal static void OnActivatedInternal(string args, Internal.NotificationActivator.NOTIFICATION_USER_INPUT_DATA[] input, string aumid)
         {
@@ -43,16 +70,21 @@ internal static void OnActivatedInternal(string args, Internal.NotificationActiv
                 }
             }
 
-            try
+            var e = new DesktopNotificationActivatedEventArgs()
             {
-                OnActivated?.Invoke(new DesktopNotificationActivatedEventArgs()
-                {
-                    Argument = args,
-                    UserInput = userInput
-                });
+                Argument = args,
+                UserInput = userInput
+            };
+
+            OnActivated[] listeners;
+            lock (_onActivated)
+            {
+                listeners = _onActivated.ToArray();
             }
-            catch
+
+            foreach (var listener in listeners)
             {
+                listener(e);
             }
         }
 
@@ -69,6 +101,7 @@ internal static void OnActivatedInternal(string args, Internal.NotificationActiv
         private static readonly Guid IUnknownGuid = new Guid("00000000-0000-0000-C000-000000000046");
 
         private static string _aumid;
+        private static string _win32Aumid;
 
         static DesktopNotificationManagerCompat()
         {
@@ -77,25 +110,19 @@ static DesktopNotificationManagerCompat()
 
         private static void Initialize()
         {
-            string aumid;
-
             if (DesktopBridgeHelpers.IsRunningAsUwp())
             {
-                aumid = Package.Current.Id.FamilyName;
+                _aumid = Package.Current.Id.FamilyName;
             }
             else
             {
                 // Win32 apps are uniquely identified based on their process name
-                aumid = GetAumidFromCurrentProcess(Process.GetCurrentProcess());
+                _aumid = GetAumidFromCurrentProcess(Process.GetCurrentProcess());
 
                 // Store the AUMID for Win32 apps since it'll be needed later
-                _aumid = aumid;
+                _win32Aumid = _aumid;
             }
 
-            // Create and register activator
-            var activatorType = CreateActivatorType(aumid);
-            RegisterActivator(activatorType);
-
             // If running as Desktop Bridge
             if (DesktopBridgeHelpers.IsRunningAsUwp())
             {
@@ -103,6 +130,10 @@ private static void Initialize()
                 return;
             }
 
+            // Create and register activator
+            var activatorType = CreateActivatorType(_aumid);
+            RegisterActivator(activatorType);
+
             // Otherwise, register via registry
             var currProcess = Process.GetCurrentProcess();
 
@@ -111,7 +142,7 @@ private static void Initialize()
 
             string iconPath = "C:\\icon.png"; // TODO: Need to grab icon from process name
 
-            using (var rootKey = Registry.CurrentUser.CreateSubKey(@"Software\Classes\AppUserModelId\" + aumid))
+            using (var rootKey = Registry.CurrentUser.CreateSubKey(@"Software\Classes\AppUserModelId\" + _aumid))
             {
                 rootKey.SetValue("DisplayName", displayName);
                 rootKey.SetValue("IconUri", iconPath);
@@ -161,9 +192,20 @@ private static Type CreateActivatorType(string aumid)
                 parent: typeof(Internal.NotificationActivator),
                 interfaces: new Type[0]);
 
+            string clsid;
+
+            if (DesktopBridgeHelpers.IsRunningAsUwp())
+            {
+                clsid = GetClsidFromPackageManifest();
+            }
+            else
+            {
+                clsid = GenerateGuid(aumid);
+            }
+
             tb.SetCustomAttribute(new CustomAttributeBuilder(
                 con: typeof(GuidAttribute).GetConstructor(new Type[] { typeof(string) }),
-                constructorArgs: new object[] { GenerateGuid(aumid) }));
+                constructorArgs: new object[] { clsid }));
 
             tb.SetCustomAttribute(new CustomAttributeBuilder(
                 con: typeof(ComVisibleAttribute).GetConstructor(new Type[] { typeof(bool) }),
@@ -182,6 +224,43 @@ private static Type CreateActivatorType(string aumid)
             return tb.CreateType();
         }
 
+        private static string GetClsidFromPackageManifest()
+        {
+            var appxManifestPath = Path.Combine(Package.Current.InstalledLocation.Path, "AppxManifest.xml");
+            XmlDocument doc = new XmlDocument();
+            doc.Load(appxManifestPath);
+
+            var namespaceManager = new XmlNamespaceManager(doc.NameTable);
+            namespaceManager.AddNamespace("default", "http://schemas.microsoft.com/appx/manifest/foundation/windows10");
+            namespaceManager.AddNamespace("desktop", "http://schemas.microsoft.com/appx/manifest/desktop/windows10");
+            namespaceManager.AddNamespace("com", "http://schemas.microsoft.com/appx/manifest/com/windows10");
+
+            var activatorClsidNode = doc.SelectSingleNode("/default:Package/default:Applications/default:Application[1]/default:Extensions/desktop:Extension[@Category='windows.toastNotificationActivation']/desktop:ToastNotificationActivation/@ToastActivatorCLSID", namespaceManager);
+
+            if (activatorClsidNode == null)
+            {
+                throw new InvalidOperationException("Your app manifest must have a toastNotificationActivation extension with a valid ToastActivatorCLSID specified.");
+            }
+
+            var clsid = activatorClsidNode.Value;
+
+            // Make sure they have a COM class registration matching the CLSID
+            var comClassNode = doc.SelectSingleNode($"/default:Package/default:Applications/default:Application[1]/default:Extensions/com:Extension[@Category='windows.comServer']/com:ComServer/com:ExeServer/com:Class[@Id='{clsid}']", namespaceManager);
+
+            if (comClassNode == null)
+            {
+                throw new InvalidOperationException("Your app manifest must have a comServer extension with a class ID matching your toastNotificationActivator's CLSID.");
+            }
+
+            var argumentsNode = comClassNode.ParentNode.Attributes.GetNamedItem("Arguments");
+            if (argumentsNode == null || argumentsNode.Value != "-ToastActivated")
+            {
+                throw new InvalidOperationException("Your arguments on your comServer extension for toast activation must be set exactly to \"-ToastActivated\"");
+            }
+
+            return clsid;
+        }
+
         /// <summary>
         /// From https://stackoverflow.com/a/41622689/1454643
         /// Generates Guid based on String. Key assumption for this algorithm is that name is unique (across where it it's being used)
@@ -215,6 +294,13 @@ private static string GenerateGuid(string name)
             return guidS;
         }
 
+        private static void CreateAndRegisterActivator()
+        {
+            var activatorType = CreateActivatorType(_aumid);
+            RegisterActivator(activatorType);
+            _registeredOnActivated = true;
+        }
+
         private static void RegisterActivator(Type activatorType)
         {
             if (!DesktopBridgeHelpers.IsRunningAsUwp())
@@ -248,7 +334,7 @@ private static void RegisterComServer(Type activatorType, string exePath)
         /// Gets whether the current process was activated due to a toast activation. If so, the OnActivated event will be triggered soon after process launch.
         /// </summary>
         /// <returns>True if the current process was activated due to a toast activation, otherwise false.</returns>
-        public static bool WasProcessToastActivated()
+        public static bool WasCurrentProcessToastActivated()
         {
             return Environment.GetCommandLineArgs().Contains(TOAST_ACTIVATED_LAUNCH_ARG);
         }
@@ -320,10 +406,10 @@ private static extern int CoRegisterClassObject(
         /// <returns><see cref="ToastNotifier"/></returns>
         public static ToastNotifier CreateToastNotifier()
         {
-            if (_aumid != null)
+            if (_win32Aumid != null)
             {
                 // Non-Desktop Bridge
-                return ToastNotificationManager.CreateToastNotifier(_aumid);
+                return ToastNotificationManager.CreateToastNotifier(_win32Aumid);
             }
             else
             {
@@ -335,7 +421,7 @@ public static ToastNotifier CreateToastNotifier()
         /// <summary>
         /// Gets the <see cref="DesktopNotificationHistoryCompat"/> object.
         /// </summary>
-        public static DesktopNotificationHistoryCompat History => new DesktopNotificationHistoryCompat(_aumid);
+        public static DesktopNotificationHistoryCompat History => new DesktopNotificationHistoryCompat(_win32Aumid);
 
         /// <summary>
         /// Gets a value indicating whether http images can be used within toasts. This is true if running with package identity (MSIX or sparse package).
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/LockScreenLogo.scale-200.png b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/LockScreenLogo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..735f57adb5dfc01886d137b4e493d7e97cf13af3
GIT binary patch
literal 1430
zcmaJ>TTC2P7~aKltDttVHYH6u8Io4i*}3fO&d$gd*bA_<3j~&e7%8(eXJLfhS!M@!
zKrliY>>6yT4+Kr95$!DoD(Qn-5TP|{V_KS`k~E6(LGS@#`v$hQo&^^BKsw3HIsZBT
z_y6C2n`lK@apunKojRQ^(_P}Mgewt$(^BBKCTZ;*xa?J3wQ7~@S0lUvbcLeq1Bg4o
zH-bvQi|wt~L7q<c#Bs@6tJZpsaDp5#@^Kxb76?JKPM4Rjg?OPEsE7|VN<kaCGX4#U
zNTLm`F?$G4$N`$9k`4t_b(DF9j%I-s(fmV5p2k4~0ig1T7HA2EIn9Qy+vVUsevG5Y
zx{BItLpMm(dMXfytN_Gpv|s{3(g?#ENwbAvnU@d>$~a-gDFP!{&TQfc3fX*6=uHv*
zT&1&U(-)L%Xp^djI2?~eBF2cxC@YOP$+9d?P&h?lPy-9M2UT9fg5jKm1t$m#iWE{M
zIf%q9@;<puwV{ydMhJnB$FpTP7~V`2Oc}26A)GW4cpwmuYh636R)YU&Y^xpiwub;-
z3Bq!lBEWk1a}r>fyT?0<D?&D0xgx=$@GVYRXbXU#>UP>tcw-bLkz;s2LlKl2qeP0w
zECS7Ate+Awk|KQ+DOk;fl}Xsy4o^CY=pwq%QAAKKl628_yNPsK>?A>%D8fQG6IgdJ
ztnxttBz#NI_a@f<SS;sI0I$l5SC(56T~N^^t8%zW4j~T5dexEVYowqkN5Z-BGHpcd
z1d8+q5Q`K!fUM`4leXai7{C&K6Nxc?hQWB61{h0|4Cb>k7SU`WtrpsfZsNs9^0(2a
z@C3#YO3>k~w7?2hipBf{#b6`}Xw1hlG$yi?;1dDs7k~xDAw@jiI*+tc;t2L<e7iLm
zP}mwR5QOujz`+rgnOi!Y{({?C=+*8leK`I4)q-bwZ~S$=`Qx8za!;_&ojSySG^`y-
zUwxr;y18tmHR*DH-R#Zfn@dafJ#VG;#JXCA1?Fhi?=z+K#EYHSuZ6R;t9!2P-`Czg
zntSi!KX=pneo0;EVH+kX{Tbnm^ke?~Z}v~j1(%4Y2eEUe-ebObqI@uC5e<?ngPC8q
zexSeKJ6Lye>flg&bM)0!Y;0_@=w%`LW^8DsYpS#-bLOklX9r?Ei}TScw|4DbpW%+7
zFgAI)f51s}{y-eWb|vrU-Ya!GuYKP)J7z#*V_k^Xo>4!1Yqj*m)x&0L^tg3GJbVAJ
zJ-Pl$R=NAabouV=^z_t;^K*0AvFs!vYU>_<|I^#c?>>CR<(T?=%{;U=aI*SbZADLH
z&(f2wz_Y0??Tf|g;?|1Znw6}6U43<uVfr(7fnD33UXp<u^(nDoL&FaIfW9||8X7Y8
zWBR>Q#qNRwv1vp9uFn1)V#*4p&%$mP9x&15^OaBiDS(XppT|z^>;B{PLVEbS3IFYV
yGvCsSX<sgWK5pRdjuceaUA*+*;fQZyG$}(jP`_}c_gGYm|0&(BGUuqhq31shAo>*m

literal 0
HcmV?d00001

diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/SplashScreen.scale-200.png b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/SplashScreen.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..023e7f1feda78d5100569825acedfd213a0d84e9
GIT binary patch
literal 7700
zcmeHLYj~4Yw%(;oxoEH#Kxq-eR|+VkP17b#Vk;?4QwkI+A{L04G+#<<(x#Un<sy7o
zz=T6NjRGwK((y9#Jd~ai1v`ouo~bn2s(1znq3XoSC<rJj6s6#tcYP_&{P3B7XJ&rL
zpR%&|yVkodd#|-Wcj4ST$?*8$j4?_6O#OVu2A^SUP|?sR{L*%M$qV>1#+h5>eArRq
zTw$)ZvTWW_Y?bDho0nPVTh08+s`sp!j74rJTTtXIDww0SILedFv?sZ?yb@@}GN;#8
znk_b~Q(A0YR#uV4ef!osoV1M3;vQ8N$O|fStfgf$S5;ddUNv`tWtGjM;koG#N;7M<
zP*84lnx(bn_KF&9Z5Ai$)#Cs3a|$OFw>WKCT$of*L7_CqQEinflT|W{JT+aKp-E0v
zsxmYg)1(T>DROm+LN1eQw8}KCTp=C!$H7`PU!t9_Hw@T<l*N@got4^@locyhB(F$I
zc2qA*N!4gHDRM=MLLtKrS<T7{r@2;EQImLEgWg(WsV=K@mN_b<q|sdLSnkZ?z%=Ya
zd1XPtFN!N_1_FhUrPP`$Q&N-VDdpwlm$<veIp6ws8o#=`X2HrzYs!3UjbnMW1^FmR
zybVU|{<$IA2sYYz)n!PE*{*k3mX}*Aoca1J4lBug8L!PSmt-j93Z+cJE6g&LCEYC3
zlqh&vsv@;mk!n#Z<?4*vdVUqJ$<ED5P1hUbik#Hc+;oj<1|n$4QOr=xNY7SjZe#N+
zYMkZ@i}kkcGO``U=KNEvHmBNZb~>sTI2`udRZv*!a5`#A9hK6Y95L(CDUX&_@QxKV
z_feX{UhA#ZWlvgpL$#w^D#lq`_A4AzDqd|Zv6y9PX&DNcN|l}_D^{q@GG&H^Pg583
z8FI6N8^H7b5WjGp;urW)d7F+_lcp%KsLX0viCmE(OHH+=%ZfD_=`voUuoUxFO^L;-
z;!;2{g-YiiO6m4bs89OuF9!p{FGtH-f%8<2gY!h9s)4ciN%{Kh1+`}{^}M~+TDH9N
z^Z5PlgVXMC&2&k*Hw^Lb9gny#ro$MOIxIt{+r)E<yd9ZacunW}hg*fgGjvbPop<m;
zYwHgOuP^=ft5tjRZge{KY~ObE&zikQp6c%#Mu%Gc)%e}?mwgzA3xhGK&J>A10$VR3
zanN8D{TUkl+v0CQ_>ZoHP<<Rb(R26XYd#;!HmvCjF5Aj<8G{noOSKmVv)xzRSlzYP
zH3&ZF1Rr%p7J*g#8$8rbf1;&r5%}{jT0BxUh}C|+F1i1LbzRkP;jN=9gC8aLPkxn|
zmV?!is~4=(k6wDF@m5g7T5t4O-&qqIV4>M-x#8@8ZiT#$Kh`(uRaX1g$Bg|qy$<#7
zSSAi{Nb8Y=lvNVeio+UGLCAtoLBfL`iOv`)yoJMDJBN>4IH@(l7YRF;61@>qq1iM9
zr@b#OC~SAxSle?5Pp8Z78{VO0YFr1x7kZU64Z23eLf2T2#6J_t;-E}DkB?NufZ0Ug
zi?J&byXeaB-uTNVhuiM!UVQw}bZrJ3GtAETYp->!{q#zfN7D3AS9@Q7*V^85jGx#R
z(QxYV<o=JJ^G8*7z17~g>(wW#F0XF9^<gl=KhqQ`eQkP{+s*>^s>>H8pPlVJ>)3Oz
z&_X8Sf@~?cH_O*cgi$U#`v`RRfv#y3m(ZpKk^5uLup+lVs$~}FZU$r_+}#hl%?g5m
z-u-}-666ssp<z#Z6st!qv>-xWQak~>PPy$mRc|~?pVSs1_@mBEXpPVfLF6(Ktf1S*
zPPh@QZ=tFMs?LM2(5P3L2;l_6XX6s&cYsP1ip#eg0`ZEP0HGYh{UmS@o`MihLLvkU
zgyAG0G`<J9gcG|!tPY_!P4`I7=faouh-T#$f7I)g#}MUVE+4rVj+q95+HQDx2-M`m
zkdzO>b1|qjxxh1(ODKFE%AP}Dq=3vK$P7TXP4GrM1kQ72!GUVMDl`rDC&2;TA}*nF
z8$nQD&6ys_nc1*E7$*1S@R8$ymy(sQV}imGSedB@{!QR5P&N_H=-^o!?LsWs+2|mH
z-e=)T^SvI)=_JIm7}j4;@*Z17=(#}m=~YF~z~CLI+vdAGlJDcdF$TM?CVI1%LhUrN
zaa6DJ=Yh$)$k&Oz{-~8yw^G<RF7+O}30+0o;O`gFL6ZoX1IR&_T|OS>M^8prYxSxo
zvI4k#ibryMa%%*8oI-5m61Koa_A_xg=(fwp0aBX{;X4Q;NXUhtaoJDo1>TqhWtn=_
zd5~chq#&6~c%8JZK#t_&J(9EVUU&upYeIovLt1>vaHe}UUq>#RGQj!EN#5+0@T`(@
z^g~>*c`VGRiSt;!$_4+0hk^I!@O3``5=sZ8IwlxWW7km1B&_t&E*u0_9UBa#VqwY*
zz>nxv?FAsVnRaD(Bui=6i==BFUw0k4n$>`umU`F2l?7CYTD^)c2X+d9X&ddS9|gj?
zM?knGkGCX&W8offw8aLC2$D{PjC3nVZwd4k?eZH8*mZ)U@3Qk8RDFOz_#WUA#vnzy
zyP>KrCfKwSXea7}jgJjBc}PGY+4#6%lbZyjhy`5sZd_Vy6Wz;ixa?czkN}J9It1K6
zY!eu>|AwF^fwZlLAYyQI*lM@^>O>Iu6Vf6i>Q$?v!SeUS<{>UYMwz$*%Aq?w^`j{h
z!$GZbhu=^D{&ET8;))LL%ZBDZkQqRd2;u~!d9bHGmLRhLDctNgYyjsuvoSZ#iVdoB
z2!f--UUA#U;<{je#?cYt^{PIyKa%hW>}uepWMyAI{{<cWnJ6pvL|pL41}J-(oRPWg
zM-qX*50rINxt_BGkpWVg&o6n7c9E3>Zo7?2>?$c9;whJae%oN|I-kpTQSx_C$Z&;f
zi2i)qmEn=y4U0uvk)$m;zKfjPK@oc?I`}1Jzl$Q~aoKBd3kt7L#7gyt|A_qgz6ai<
z=X%D1i!d2h?rHR^R8SUj&<fA>G||dkC?DT>{o#Yau<@uqVT{Xef&XG}5*E4aPk{}~
zplx&XhaV)&1EfI3Em;Bw#O5SV^c;{twb-1Rw)+=0!e_BLb<g4VQ<$kav69K&?YK$U
zSn>d7tYmXCH0wrlOSS+~`7He8Iqx0{CN+DVit9;*6<q@@O!Qu+g^^Tdi`@3>L~JAN
zD&cyT)2?h}xnYmL?^)<7YyzZ3$FHU^Eg;DLqAV{#wv#Wj7S`Jdl1pX&{3(uZ?!uh}
zDc$ZTNV*7le_W6}Hju~GMTxZQ1aWCeUc%!jv3MHAzt>Y-n<EkAQ1Ft6Qh6R%AFFko
z7F9XP-y`W^gq9FXcO{8bB57D}O$hU<BcUQe8D2pu*f$9>QK%zfT*3ebDQA5b?iGn;
zBjv3B+GhLTexd_(CzZDP4|#n5^~scvB6#Pk%Ho!kQ>yYw((Dv{6=$g3jT1!u6gORW
zx5#`7Wy-ZHRa~IxGHdrp(bm%lf>2%J660nj$fCqN(epv@y!l9s7@k6EvxS{AMP>WY
zX4$@F8^kayphIx-RGO$+LYl9YdoI5d|4#q9##`_F5Xnx`&GPzp2fB{-{P@ATw=X@~
z_|&^UMWAKD;jjBKTK(~o?cUFRK8EX=6>cXpfzg4ZpMB>*w_^8GSiT-Jp|xBOnzM+j
z*09-@-~qJ(eqWq5@R4i^u4^{McCP(!3}C|v_WsTR*bIUxN(Nx`u##3B4{sE`Z`v8w
zAwIG`?1~PkID~W{uDzmqH98Pew_1(;x2%8r^vY{)_&J2K)cN{W+h5+g)ZcjP&Ci#O
zgy|8K@4kyMfwilHd&6TDlhb%++Pk!>9HRld6HT7gwyZGrxS$}CsD6`>6!!2K1@Mjf
z(P0WYB7V_OFZyeWrbOFb>O54BNXf~K&?}3=^v;v_wT{DKr?jN<g%9FICA!H3yBRj^
z6wALWHoRiNN}JanUP`BO-v9mpD3O+4yfm;Rq81HMd>^DtN&DXwX%u?s*c6`%8>WFz
z7}YW^tp0b<fuXMNSxPLOTYggOW0Mhpkz{I-+jgCzC?0h~?^z65Oh+$*hWhp=F<Y@{
z+O^YV`--9@E^KTcP4U}J3+QH6TA+)@cd6r$SC3HD5w()u#rHy&k0A1?RR@w$D<--s
z(dSNYg5tJ1aOpM}ZL?7~wc-`VwO+#n#y+8|`nBl5jaVd-26tSWHVf4ujr79DZkvUw
z>p^NriE)AB6M<Pn3JgiD^##!OV*>2l<7rn7fzePtR*omOevpfm9n?}2V*+0iW;S)C
zhg`NAjL?D=W#k*$aR{>pGf~lD-rVtD;5jW1_*Jn1j1=es@Kcx4ySM_bwcQCT=d+DV
z>Sz~L=Hj@(X%31nK$mWI@7d>}ORB`K(p=+`UD)+99YUGQc7y^bHZ<HF=>1F(8|tL0
zdK*DT0kSXG_{BKTpP2*2PecdKV9;dq$^ZZDP;Nyq1kp-<Z~QVOz;_ZcZys4yKNOIr
z9f<5UY3oBz!{i)t|HTd^dNLqHe?z-L0{U{YqMmJhX%ay;0kV5S>&GI5eAyZsK!e3V
zK@rPy*{(`KIfo+lc878mDKk^V#`VT05}64kBtk%DgwLrOvLMj5-;*GNKv6c6pzMuL
z6EP%ob|_0IW}lLRXCP2!9wWhEw3LA7iF#1O1mIZ@Z=6&bz41F;@S_GvYAG-#CW3z{
zP3+6vHhvP&A3$##Vo9$dT^#MoGg^|MDm=Bt1d2RRwSZ<;ZHICpLBv5Xs!D?BH^(9_
z7`H=N&^v|Z-%mP}wNzG{aiFCsRgwzwq!<DB=Ns!f2{M!*F#&p+u%U>N6obW9+7(R;
z(SZ=23`|`>qil!LMGG{_Heq!BD>(Y-zV9wD)}hz25JA37YR%39;kI4y9pgtcUass6
zP24}ZY$vvYeI`zy&)A_X#nY3017ap*0&jx|mVwyGhg3;!keU53a}Uhm3BZI$N$6Se
zLWlAmy1S0xKJm4G_U@sN_Tm=`$xWJSEwKU98rZ&)1R^*$$1vA3oG#&*%SMxY_~oGP
zP&PFJatFLM-Ps%84IV-+Ow)T{C7cqUAva<JG?uf`802)*d*ja~c_Vz(2hQgh>uy4C
z(FRz&?6$Rypj{xO!`y=*J5o4@U8Q-(y5(*=YoKeZ+-1YdljXxkA#B)zo=FeQH#?Le
zycNUmEEHWO9a=X^pb#&cOq7-`7UA87#|S22)<7RUtZo|(zibX=w;K3qur9vy#`MNV
z6UUcf9ZwEnKCCp+OoBnF@OdbvH)ANXO0o~Pi9l8=x3))}L<#vO0-~O4!~--Ket?d}
zJaqsj<@CD1%S2cTW%rOP{Vto%0sGW~1RMa<ND|1IehBF#7$EdOSU>_j^)5nil0Yw-
z0EE#bP+l4#P^%PQ+N*ox<x}AeHJ=ck7u|T@3UddmSad+3M4ku2gn6!kDxe;*Y{7fN
zi*qVI^B-~BbWcK6I<D3>u1Zq05xZ!bXfYTg>9c{(Iw*lnjR^>kz%lAN^zFce7rppy
zY8zA~3GD=A6d*hze&l4D_wA~+O!56)BZTe_rEu}Ezi<4!kG|W#amBZ5{&XS2@6R~H
z{9o^y*BkH4$~yX9U&@CgbOzX1bn9xqF|zh$Dh0Y5y*E0e90*$!ObrHY3Ok0`2=O~r
zCuke6KrP9KOf?V(YDsM<6pX2nVoN%M$LT^q#FmtaF?1^27F*IcNX~XRB(|hCFvdcc
zc)$=S-)acdk$g4?_>jRqxpI6M3vHZk?0c^3=byamYDNf;uB{3NlKW5IhnOS3DNkMV
z?tK8?kJ}pmvp%&&eTVOVjHP`q34hN1@!aK}H(K!vI`~gf|Gv+FNEQD5Yd<~yX7k_l
h&G-K)@HZb3BABY{)U1?^%I#E6`MGoTtustd{~yM6srvu`

literal 0
HcmV?d00001

diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square150x150Logo.scale-200.png b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square150x150Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..af49fec1a5484db1d52a7f9b5ec90a27c7030186
GIT binary patch
literal 2937
zcma)84OCO-8BSud5)jwMLRVKgX(S?$n?Ld|v<nH?kn$sict<-=F3H8Dn4cyWK{$0G
z>rsm<$CF7)&zTbyy1FE5bU`Q17MRv`9ue$;R(@8kR;#vJ*IM0>cJIAOte!d7oRgdH
zd%ySjdB6L9=gX^A6)VzH7p2l@v~<HW`f3`DE+D@tKZ3~mmphx_=W(J0C7yFN5Y3ne
zr)jOOdYo%;U~BMd9J8)}>3zJAMw|DFy#^)F@@F*`mqUn=Il>l)8_+ab;nOW{%+iPx
z+<JVC-C4xDcIaIm*KRH1t&*3E%iTKMW`CyDgFn|=QDbRsw5YATr=Q{$wrGIBffE?F
z#j)1u)wC4xC|(VW$*_pWrBaB-B3|4ST3*G~xjZ;mE>s{Eu|&pIs)Z7{La9~?xKfyl
z#43?gjEL15d4WbO<t9EnQ1e(DG}Zdjgci(-cs7D?Yeb^v=4N4YfzahyBa*1qYLQqf
zl1dTCK)man1lEE$y-Sh|dfaRA*xiKP<>Zo#SiP%>DB^+BcnJ=7dHEe;r#G=tuw|ka
z%q@}##Uh7;tc%L_64m(kHtw74ty%BJMb)_1)#S0j`)F8_1jF7vScpsnH=0V19bO8y
zR`0SjIdCUo&=>JwMQF8KHA<{ODHTiQh}0^@5QRmCA?gOH6_H3K^-_sNB^RrdNuK-R
zOO*vOrKCVvDwgUck`kF(E7j{I#iiN;b*ZdCt4m@HPA`EuEqGGf4%!K<;(=I=&Vyrw
z%TwcWtxa}8mCZ%Cyf&ActJ6_$ox5z6-D!0-dvnRx6t7y3d+h6QYpKWO;8OdnvERo7
zuEf>ih5`wqY)~o@OeVt-wM?Q!>QzdGRj!bz6fzYrfw$hZfAKzr2-M+D+R><F7PUns
zRU-{zsS=S$a2ZmsR>}~oT574c;_3zquHcElqKIsryILt3g8n3jcMb+j?i?-L3FpZJ
z2WRVBRdDPc+G5aaYg#5hpE+6nQ|(VSoxT3|biF;BUq#==-27Xi=gihDPYP$7?=9cP
zYKE$jeQ|3~_L0VG-(F~2ZPyD0=k{J4Q~h(t__{-mz_w8{JDY9{`1ouzz!Vr5!ECdE
z6U~O1k8c<ZzzjlnCH%YX${yj@w{F?w{KJ!{PrtD+n4J^Wef8w^z&DXM|I)oM*xQ}t
zqR_xap$(h*SARL3_1<;-iIZ2CUh3V{ee#^@p^2$U<fEG}t?l7&pC57=kLI1tJv**)
z7B+QNY#cw<SLwN=HTrAkqoV<H1}ihx`w7}Vc;d&%o@FM4IHxn_Z62RC&*+RDM=oy|
zdH>}24V7~zzXWTV-Pe4)y}wQJS&q%H5`Fo_f_JvIU489aCX$;P`u#!I-=^<j%|=Vw
zSqR&-(oBXQO^W@GFy-O3w77>4ijC2{&9!O&h>mi?9oYD=GC#%)6{GzN6nQY<q5Tz#
zTo^FW{!Ya*7>w+Fal50!#x^asjBBR50i`+mho*ttoqV)ubM2KD9S~k7+FR4>{29?6
z{!l6kDdyTN0YJ9LgkPWeXm|gyi@zM3?0@{&pXT12w|78&W-q!RRF)&iLCEZVH<|fR
zN0fr2^t8H(>L?>K#>^+jWROLral(Qy-xoBq1U7A&DV||wClb)Otd9?(gZ|8znMF}D
zf<1haWz^s0qgecz;RFGt0C-B4g`jNGHsFU+;{<%t65v^sjk^h$lmWn#B0#_)9ij&d
z-~lc`A)YYExi^7sBuPM^Y|wA2g*5?`K?#7tzELQYNxGo$UB$4J8RJp1k(8Jj+~hMT
zlN~>M@KTTh^--8y3PK_NZ@AC!{PT=CziBzGd+wTJ^@icH!Bd}%)g8V)%K?|c&WTUk
zy}qv1C%(fjRoZ4ozC3{O%@5?)XzH35zHns$pgU*Q?fj4v?fp1Qbm+j;3l;9jam9Da
zXVcKjPlQ73x78QPu|Ffm6x?`~e3oD=gl=4kYK?={kD5j~QCXU)`HSdduNNENzA*2$
zOm3PzF!lN5e*06-f1Uot67wY#{o-S1!KZ7E=!~7ynnk9_iJR#kFoNbAOT#^2Gd17F
zMmvU6>lndZQGd|ax9kUoXXO+$N?|j@6qpsF&_j7YXvwo_C{JpmLw5&#e6k>atv%es
z5)7r*Wvv_JkUpT}M!_o!nVlEk1Zbl=a*2hQ*<|%*K1Glj^FcF`6kTzGQ3lz~2tCc@
z&x|tj;aH&1&9HwcJBcT`;{?a+pnej;M1HO(6Z{#J!cZA04hnFl;NXA+&`=7bjW_^o
zfC40u3LMG?NdPtwGl>Tq6u}*QG)}-y;)lu-_>ee3kibW(69n0$0Zy!}9rQz%*v1iO
zT9_H>99yIrSPYVy6^);rR}7Yo=J_T@hi+qhTZXnVWyf;JDYm5#eYLTxr*?kiNn!+Y
zQ+LUkBafN<rj@ac(SyTfdB2``SXPM|j*cxVzL1j7uG_MM8_u?sK&kAyM?l|iVxrMN
zPX;~ne&HLH5scrZ4K0p-_|3Zq_OuTByUzD!c!vkFj<LeMfBwzHp^h8@YIq|jvgP2?
z9k=KkqJax5V4ng#<K(krcNgr>J#rH#C(?d5^;gw9o#%daEI{mA*LHPIHPU`#|H$hD
zwm>0&+kahQ)E#%~k>&5@&#Vg82H?s%71=)(soi@174pi9--2{w{1$}Sz4zGn3Du&x
bht0Iza^2ykEt4(epJ78uh5nDlX8(TxzDYwP

literal 0
HcmV?d00001

diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square44x44Logo.scale-200.png b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square44x44Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce342a2ec8a61291ba76c54604aea7e9d20af11b
GIT binary patch
literal 1647
zcmaJ?eM}Q)7(e+G1Q(|`V9JhTI2>MkceK4;p;PR&$Pi?ejk3YQ_3o`S&|W_dsOZ8#
zWPTt69g`t$ab`0cj-Y0yiBSOqmd)tG7G(}M5aP0_%&9TijB#&)I{zSE^4@#z^FF`l
z`8{8`o%wlL(UI|y2!cdsuVamHH~H86F!*-15em4)NqUpCQM5?aoC_eCf@lV4wvF2a
zjDQn1JBL69f&@2M3rvzJcfE!eZ8FZUBlFlC5RD)it33{mF9#B82AiyQE%w)`vlwa>
zv{<1sm&kSKK$&%2jSFn7$t&P%%6Ue>R=<X3cr?&}4M-g7u~pdJ8jlv6wyS~Pez6=w
zr&XkKEjB~Sl$($0L>EAnG8N7fqynWG8L3p!4801a;8{+n<rIMvj7FKJAt-eA!Js#n
zV9^*^!>liO(qd(j<j~0F)z#Iq>NJ_?+9W3#hLIDLoT6~3fx9=`CC-D}-AMrpEO7HK
zt3$GicGPc?GmDjy7K2P@La;e<bDtQtyJr&xQzrLt4ml|!<Tjf>u4!$zWCZ`ym{Z$b
zu-O6RM&K4JT|BIZB`E-gxqG%FzanI#+2FFmqHq<g$XD8cUCL&)7`%}QRzX8^7Mda`
zB~A$xhpTu6hcgyRz)6ZUQzWle5^6eNXD&RvRx$>XG7yxWB=w55RGOM)$xMb(>kSNR
z2w=1AZi%z=AmG~yea~XaXJR!v7vLn(RUnELfiB1|6D84ICOS}^Zo2AdN}<&*h}G_u
z{xZ!(%>tLT3J3<5XhWy-tg+6)0nmUUENLW8TWA{R6bgVd3X;anYFZ^IRis*_P-C-r
z;i>%1^eL3UI2-{w8nuFFcs0e~7J{O2k^~Ce%+Ly4U?|=!0LH=t6()xi<^I-rs+9sF
z*q{E-CxZbGPeu#a;XJwE;9S1?#R&uns>^0G3p`hEUF*v`M?@h%T%J%RChmD|EVydq
zmHWh*_=S%emRC*mhxaVLzT@>Z2SX0u9v*DIJ@WC^k<V?z``Q$(M}8`~@@9hcMtV<h
zde8Z&v6Hrv<iw6I|G5|6*`Tto7~DG5&b%0P`j40kroR1u$KAb_`tXQR)OGjNojrR;
zIr-Y;P|DPbNw=@$Rycaxb?Mm6+R_Q{<BFxhwGA1uSqc5x`>LVdlGV6LpK$KIrlJqc
zpJ921)+3JJdTx|<`G&kXpKkjGJv=76R`yYIQ{#c-`%+`#V(7}Q;&@6U8!Td1`d;?N
z_9mnI#?AA}4J!r)LN4!E-@H5eXauuB7TOawS>Y|{-P?NNx-lq+z1W-+y(;39P&&LP
zL{N<u_jdY@dYL+=<!7fm_;+?`-S_i4gNveMFA&McQ;PFSBL$~-w71=dIg=3{-96A2
z)LEa=cxwOqsS%!tyGy#;Z?M)!eaC#SI+BCVqg{P%kr~@ZAAA*5NZpCOdvZgJcet)L
z>80?&=C*qKmdA^moMZRuPcD!B<*mq$ch=0Cnlitw#txRWhb3%TQvPqjkC`F69G4b!
ze7z9MZ#+;_#l?H37UqUhDFb^l&s2{oM$3I0o^Q!yx;;V)QmCMo)Tb_ui|mit8MS?U
zm##6$sZZ1$@|s%?l@>4Z<*Q}sRBSKMhb4I{e5LdEhsHIHTe8Bod5c>6QtT>$XgUBz
z6MK`kO$=jmt@FqggOhJ5j~e@ygRbG;<{Vu)*+nn9aQeo0;$#j;|MS=S$&L?BeV25z
xs3B`@=#`5TF{^6(A1rvdY@|-RtQ|iS5{tyX+wH?;n8E)G$kykv-D^wh{{!TZT%7;_

literal 0
HcmV?d00001

diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6c02ce97e0a802b85f6021e822c89f8bf57d5cd
GIT binary patch
literal 1255
zcmaJ>TWs4@7*5+{G#S+<G69{CW?TuiXeYkMv1xisQWlzol0`IV5A4`JZcXaTY?q{w
z&?qX=E<%VR9^fg07bdg|(uRb1SP@065)#_u(4;|M;B82}FnECDG%0(iX30M1Kj;7c
z|NCz~KVN!rD0Va!3WbL9C$eR{J{`P+2k`fodipQC4EwpNf6~_dI&@KJTC){I<W0DU
z$_Q$!XSUIJC^WEcRH}ZpSddlQOu#@V(J&p14u!@i8xB-!$R`xEXjp0T{x>&C!qC#>
zf>5N3P6jO*Cz>ug*(_DmW=)kea&m$gZ^+nyiF`;j%w@}y8)>p*SH}C`m?DXeieF2U
zyQHecc_L%Gh!7G<pwbLah*E+PlA<IYCs-^~bc$kWKufZ~$uvuJ9};_WHC--eXS=?z
zlqQ#a-;pV*Uau$WT*7u2DMpecie@R61y}=ktCkNN!16|V7P81wUBmGW+adysP_bA1
zG>Mt+hG06y;+|p4>m~}PjA}rKViGiEnn7G0ZO<>G|7q;2?NwGCM3s?eued6%hd$B+
z<J>*kQJ{#~$S=DFE(%=E+UkmlEI*%3llUf~8Ja9YU1Vui0IbGBkW_gHB%Rd&!!ioX
zs40O?i9I{};kle7GMvE7(rk`la=gTI)47=>%?q@^iL-nUo3}h4S}N-KHn8t5mVP8w
z&bSErwp+37<z5%eFWJ8BE!hr{$#kktj4l|KX4k#3piH|_XOU~XiL_bQHi=H2Wn&)>
zNJJ8?a|{r5Q3R0Z5s-LB1WHOwYC@7pCHWND#cL1cZ?{kJ368_*(UDWUDyb<}0y@o#
zfMF016iMWPCb6obAxT$JlB6(2DrlXDTB&!0`!m??4F(qWMhjVZo?JXQmz`1*58Z=&
zcDmB|S-E@j?BoFGix0flckqdS4jsPNzhfWyWIM98GxcLs89C(~dw%$_t;JjX-SD}E
zfiGV;{8Q%8r}w9x>EEigW81>`kvnU@pK)4+xk9@+bNj9L!AAZ@SZ@q|)&BmY3+HZx
zul~BeG4|}-;L%cHViQGQX?^zFfO0&#cHwel=d`lH9sJ-@Sl@n*(8J2>%Ac`IxyY?Q
z{=GhWvC#gu-~Ia7*n{=+;qM?Ul_wy1+u7ho;=`>EwP^g~R@{unBds`!#@}tluZQpS
zm)M~nYEifJWJGx?_6DcTy>#uh%>!H9=hb^(v`=m3F1{L>db=<5_tm+_&knAQ2EU$s
Mu9UqpbNZeC0BbUo^Z)<=

literal 0
HcmV?d00001

diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/StoreLogo.png b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/StoreLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..7385b56c0e4d3c6b0efe3324aa1194157d837826
GIT binary patch
literal 1451
zcmaJ>eN5D57_Z|bH;{0+1#mbl)eTU3{h)Wf7EZV?;HD@XL@{B`Ui%(2aMxQ~xdXSv
z5nzWi(<Qp0OO$NM7W~Q_8E#Xi$ik*$nyFjFERiL|C5FvR_m#Nm-UE*L2eC=}zR&wU
zzvuZqU+t~gP??tUObUV^Y2GTg53Y3lH73JvZdvRkT$bsc2E9%R=n+8$h(l8R0QCli
zCg1~t)c*1XP>LW)U2=Vc-cY@s7nPt{i0hc6!7xN4NNHI#EQl>YNBy8l4%x9gr_W-j
zEZMQmmTIy(>;lblRfh`dIyTgc9W5d!VP$L4(kKrN1c5G~(O_#x<D+(L#x4){@nZr*
zXH@hSJ2p$Ip}GcjDJnoMW-Bg|6oayynX*_}jx9oIC=;ZOph=wMcuO%)(&*fSL2s%Q
z;C=3jIbTq+W6ioA<_RJaiI^kBW<_lxD30R@k|t;xhZ?xn9@2#<9@17OEVzLts&ZJD
zl@J=YDEO7_x*dZ|XF~{vtE=Y?hqSpw!ITkEAxuzak_ZOlam{FJx)1zMV?k}LzC8>G
zAJCNTstD^5SeXFB+&$h=ToJP2H>xr$iqPs-#O*;4(!Fjw25-!gEb*)mU}=)J;Iu>w
zxK(5XoD0wrPSKQ~rbL^Cw6O_03*l*}i=ydbu7adJ6y;%@tjFeXIXT+ms30pmbOP%Q
zX}S;+LBh8Tea~TSkHzvX6$rYb)+<VDq6=!86<yJql`!gZ%~TyN*er)6C88C^%QPFc
z8>n&{kSbIqh|c7hmlxmwSiq5iVhU#iEQ<>a18|O^Sln-8t&+t`*{qBWo5M?w<Zrf5
z;R%c*oS?(o7?BfgG=~RBn#Cy!Fu0#%8C>FM(JuimAOb5!K#D}XbslM@#1ZVz_;!9U
zpfEpLAOz=0g@bd6Xj_ILi-x^!M}73h^o@}hM$1jflTs|Yuj9AL@A3<-?MV4!^4q`e
z)fO@A;{9K^?W?DbnesnPr6kK>$zaKo&;FhFd(GYFCIU^T+OIMb%Tqo+P%oq(IdX7S
zf6+HLO?7o0m+p>~Tp5UrXWh!UH!wZ5kv!E`_w)PTpI(#Iw{AS`gH4^b(bm^ZCq^FZ
zY9DD7bH}rq9mg88+KgA$Zp!iWncuU2n1AuIa@=sWvUR-s`Qb{R*kk(SPU^`$6BXz8
zn#7yaFOIK%qGxyi`dYtm#&qqox0$h=pNi#u=M8zUG@bpiZ=3sT=1}Trr}39cC)H|v
zbL?W)=&s4zrh)7>L(|cc%$1#!zfL?HjpeP%T+x_a+jZ16b^iKOHxFEX$7d|8${H-*
zIrOJ5w&i$>*D>AKaIoYg`;{L@jM((Kt?$N$5OnuPqVvq**Nm}(f0wwOF%iX_Pba;V
z;m@wxX&NcV3?<1+u?A{y_DIj7#m3Af1rCE)o`D&Y3}0%7E;iX1yMDiS)sh0wKi!36
zL!Wmq?P^Ku&rK~HJd97KkLTRl>ScGFYZNlYytWnhmuu|)L&ND8_PmkayQb{HOY640
bno1(wj@u8DCVuFR|31B*4ek@pZJqxCDDe1x

literal 0
HcmV?d00001

diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Wide310x150Logo.scale-200.png b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Images/Wide310x150Logo.scale-200.png
new file mode 100644
index 0000000000000000000000000000000000000000..288995b397fdbef1fb7e85afd71445d5de1952c5
GIT binary patch
literal 3204
zcmbVPeQXow8NYmBd90>}0NP?GhXW~VaeThm=a0tV#EwJMI!)6M3}|c4_Bl3=Kd>G0
z(GHx1wl<7(tP?FsOQkTilSo*iIvF%uA<Q6EV}q=%Yn)L!+JX33Xw?F0H>rExJ73~P
zSv1xEy!U(Wd4A9D`FQV@W3@F^qJ@PEF$@z`Z!*<kSZ*_h<*XM9U}yK*J0HOE<8Y-l
z{IuU0Zl!|^R_^fI7`)m`H!*b#?P%Zm9#e*4d3)XU*09y`gwF2wme9ziq|F-uZwxEj
z*cPDe9wv<2m?pPRFTFE%N{YK3dg&IGg|GySjLW^LBgj16QB!a4@YuBu>BbFsS(^?B
zyiAzJ+q})bkgiQHWqEb*jJD-coHYr1^iocg)l!Qa{Xqs-l~6J}p-|##ZHYofskQ3$
zI0;xzXyhazBeXhIsg5A=%ufo@f)1yy&ScKS0;HF^!r_2UE^lpZEom(+@duma3awTv
zCrCL-%D_SvYWIcdHkmI}#50(fkUi)Qgx!80ju>g1za^}ff>JI8Z@^-iCiaCgg@TgF
z+vtE?Q9{VQUX&MW9SYYmGcxA14%N2@7<nBN^0x%-&<|%3?+mq@KM*nmHM%E*ZfFYK
zZ1US%yo@hgZPH8OO^L(p(5Y#snj}b-jC7E+jIt|fnbt`<WC~JYBNcXyiqNQep1J(B
zL}`UmVIs@~X;dgGl^Uv&Fe-_P%5t@tB$Va6Z?!KJrhRsXkL`xooUhS5udmJ+WazLz
zSnu~Y^HWgk@`wE)mp_0TjcnKPbz9s%hrc!S6VxUyYZDW6?_wP0px=wLb=JA(&_GcR
z4db-aveHsDDWfQ5smw-dXqifFca&;u4mClO(u}_&tA5;^!VcsS;N|GFrKHnN(HfbP
zAk{L3f>FwBTD4N<(2{nWgV8$e3?-F=L^&FrtWn~(U_Q~~^uYiyeY6-KoTnfh9AWz@
zIKje0)u!_Lw)E}G!#kEfwKVdNt(UAf9*f>tEL_(=xco-T%jTi@7YlC3hs2ik%Le0H
ztj}RTeCF(5mwvi3_56>-yB?l;J>-1%!9~=fs|QcNG3J~a@J<S_$cf|D94yk9hZ%-)
zFd>Cu`4SB460s0ZO+##4fFUSGLcj_ja^fL4&BKALfb#$6$O?>P@qx2Agl^x0i&ugt
z<N2wJ<KvxcBaPkVBMsQM%C~b*tXLJx<x}BR&0-Yq>sy5Pyu=()`7HRMG3IB7F1@`_
z+-!J%#i6e^U$e#+C%Q>_qVRzWRsG^W_n+@OcX@vzI&z;mzHNb!GQ?LWA(wtpqHqTM
z<q@$5PepVaVw8D_rzt7u5}mv0KHS=W;IrX-W9RM1x;y^xqUh$1Enj@to+?V~K7Rk)
z#o^>1OFw_{Zn?fD)p)`c`kOgv{de=v@suGRqY{N^U7gI1VF3*F=obwaXI6ob5__Yn
zVTguS!%(NI09J8x#AO_aW!9W7k*UvB;IWDFC3srwftr{kHj%g)fvnAm;&h_dnl~<p
zveB`L7p!^tk|;G%oUI~CWujZ+F$jp%fC`Yzs@PQMeXHLx03o9*y;a;3rz{5mr>MY-
zf+K}sCe8qU6Ujs`3ua{U0Of$R_gVQB<l$++?20OeO#?_IUn16|Kkg|@qc@SSChoZs
zkP37TQUJ+V28<r8oMzzYSvvD_UYQ4mmzOEon#o!g_#O}WJ#6I2X)ZL#V@2myu>uUA
za0v=mu#vIOqiiAZOr&h*$WyOw&k-xr$;G4Ixa!#TJNr>95(h>l%)PUy4p+^SgR(uR
zta%k*?ny-+nAr8spEk1fo{J4i!b^Fia`N{_F6@zidA2ZTTrjl#^5Z-2KfB@Cu}l9s
z(*|Z2jc?p~vn2f)3y9i*7zJV1L{$?|&q)4oaT;uXi6>1GkRXVTOzAz(RHEmr=eFIi
z`}<>-Q?K0GN8!IYxeP1XKXO+jsJbp~o^);Bc;%b7Flpe7;1`Ny@3r7ZR;?R)aJt8C
ziNlEC<@3f_lIV4TwV}&e;D!Ee5_|e#g0LUh=5vmYWYm7&2h*M>QPKvGh9-)wfMMW3
z8J9b%1k7dzPzO0_NGQy92BZ^FR6R~6;^6?lqO;-QUP4BY%cG%3vEhbm#>4vIhPBh3
z-+pZGjh$x%Hp{?=FHsMp0&wNPlj00us{&`1ZOZTqs8%4X&xH=UDr*xyBW(Zp&Em94
zf)ZSfn#yg0N)>!1kWdkqJ^S*z0FF5|fj&qcE<e^1ftk%tIKfd0mBI+0I&Ou06TNp=
z&yb^U6AChy>#Na|%OY0$uO>!&hP+1ywfD<vV+COOggX6NynIPb$}ph#m+RK<pMDh`
z^)v|YYUu8FrednD%E_IFUw-JqL)%t;@abOB&5n_Oe)PKaXhXbZc``?#rMpjDSrb$3
zsG5vzMujXygM=py@lFo>_WXk@4J(?MBftK7>$Nvqh@tDuarN%PrTLQ2Uzysx>UV=V
zk^RrDSvdQ?0;=hY67EgII-f4`t=+i*yS=Y~!XlqIy_4x&%+OdfbKOFPXS2X5%4R{N
z$SQMX^AK6(fA<E@x_xIU;hp|B2Xub6jx3JId*2kD#-zPd&sU`0wV?k6)s;1-;}wlv
F{{^ZoKyCm4

literal 0
HcmV?d00001

diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj
new file mode 100644
index 00000000000..5453cbfaa55
--- /dev/null
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|AnyCPU">
+      <Configuration>Debug</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|AnyCPU">
+      <Configuration>Release</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <PropertyGroup>
+    <ProjectGuid>54349ab0-9e41-4aa6-849c-ec9ce80cdd2a</ProjectGuid>
+    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <EntryPointProjectUniqueName>..\Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj</EntryPointProjectUniqueName>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Images\SplashScreen.scale-200.png" />
+    <Content Include="Images\LockScreenLogo.scale-200.png" />
+    <Content Include="Images\Square150x150Logo.scale-200.png" />
+    <Content Include="Images\Square44x44Logo.scale-200.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Images\StoreLogo.png" />
+    <Content Include="Images\Wide310x150Logo.scale-200.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj">
+      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+</Project>
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Package.appxmanifest b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Package.appxmanifest
new file mode 100644
index 00000000000..7ff22287bad
--- /dev/null
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Package.appxmanifest
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
+  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
+  IgnorableNamespaces="uap rescap com desktop">
+
+  <Identity
+    Name="2f4b322e-d4a6-4e18-ba97-a8ee9232d8e5"
+    Publisher="CN=aleader"
+    Version="1.0.0.0" />
+
+  <Properties>
+    <DisplayName>Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject</DisplayName>
+    <PublisherDisplayName>aleader</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject"
+        Description="Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Images\SplashScreen.png" />
+      </uap:VisualElements>
+
+      <Extensions>
+
+        <!--Register COM CLSID LocalServer32 registry key-->
+        <com:Extension Category="windows.comServer">
+          <com:ComServer>
+            <com:ExeServer Executable="Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.exe" Arguments="-ToastActivated" DisplayName="Toast activator">
+              <com:Class Id="80cc4528-e348-11ea-87d0-0242ac130003" DisplayName="Toast activator"/>
+            </com:ExeServer>
+          </com:ComServer>
+        </com:Extension>
+
+        <!--Specify which CLSID to activate when toast clicked-->
+        <desktop:Extension Category="windows.toastNotificationActivation">
+          <desktop:ToastNotificationActivation ToastActivatorCLSID="80cc4528-e348-11ea-87d0-0242ac130003" />
+        </desktop:Extension>
+
+      </Extensions>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <Capability Name="internetClient" />
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
index 431094222ce..bb4db7cd6e9 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
@@ -17,7 +17,7 @@ protected override void OnStartup(StartupEventArgs e)
             // Listen to toast notification activations
             DesktopNotificationManagerCompat.OnActivated += this.DesktopNotificationManagerCompat_OnActivated;
 
-            if (!DesktopNotificationManagerCompat.WasProcessToastActivated())
+            if (!DesktopNotificationManagerCompat.WasCurrentProcessToastActivated())
             {
                 new MainWindow().Show();
             }
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index b1f81ebd7e0..cdf9d63bc71 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -125,17 +125,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{88C6FFBE-3
 		ThirdPartyNotices.txt = ThirdPartyNotices.txt
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Win32.WpfCore.SampleApp", "Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj", "{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Win32.WpfCore.SampleApp", "Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj", "{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}"
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject", "Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject\Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj", "{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{4e9466d1-d5aa-46ac-801b-c8fdab79f0d4}*SharedItemsImports = 13
-		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
-		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13
-		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{a139968e-ad78-4e8c-93b8-9a5523bcac89}*SharedItemsImports = 4
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{5524523e-db0f-41f7-a0d4-43128422a342}*SharedItemsImports = 4
+		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{9b3a94a6-0d29-4523-880b-6938e2efeef7}*SharedItemsImports = 13
+		UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{a139968e-ad78-4e8c-93b8-9a5523bcac89}*SharedItemsImports = 4
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{bab1caf4-c400-4a7f-a987-c576de63cffd}*SharedItemsImports = 4
 		UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{d9bdbc68-3d0a-47fc-9c88-0bf769101644}*SharedItemsImports = 5
 		UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{efa96b3c-857e-4659-b942-6bef7719f4ca}*SharedItemsImports = 4
@@ -1117,6 +1118,51 @@ Global
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x64.Build.0 = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x86.ActiveCfg = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x86.Build.0 = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.ActiveCfg = Debug|ARM
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.Build.0 = Debug|ARM
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.Deploy.0 = Debug|ARM
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.ActiveCfg = Debug|x64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.Build.0 = Debug|x64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.Deploy.0 = Debug|x64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.ActiveCfg = Debug|x86
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Build.0 = Debug|x86
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Deploy.0 = Debug|x86
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.ActiveCfg = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.Build.0 = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.Deploy.0 = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM.ActiveCfg = Release|ARM
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM.Build.0 = Release|ARM
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM.Deploy.0 = Release|ARM
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM64.ActiveCfg = Release|ARM64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM64.Build.0 = Release|ARM64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM64.Deploy.0 = Release|ARM64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x64.ActiveCfg = Release|x64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x64.Build.0 = Release|x64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x64.Deploy.0 = Release|x64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.ActiveCfg = Release|x86
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.Build.0 = Release|x86
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.Deploy.0 = Release|x86
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.ActiveCfg = Release|ARM
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.Build.0 = Release|ARM
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.Deploy.0 = Release|ARM
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM64.Build.0 = Release|ARM64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM64.Deploy.0 = Release|ARM64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x64.ActiveCfg = Release|x64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x64.Build.0 = Release|x64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x64.Deploy.0 = Release|x64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.ActiveCfg = Release|x86
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Build.0 = Release|x86
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1153,6 +1199,7 @@ Global
 		{804D0681-52F6-4E61-864A-699F0AB44B20} = {C79029AF-2E9B-4466-BAC4-1A41B281EAE6}
 		{88C6FFBE-322D-4CEA-842B-B2CB281D357D} = {CFA75BE0-5A44-45DE-8114-426A605B062B}
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405} = {9AD30620-667D-433C-9961-8D885EE7B762}
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A} = {9AD30620-667D-433C-9961-8D885EE7B762}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}

From 568601bc031b25de5752f8c5bb3e47eeb3849a80 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 20 Aug 2020 19:17:18 -0700
Subject: [PATCH 04/46] Styling fixes

---
 .../DesktopNotificationManagerCompat.cs       | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
index c80e0f8468f..de4378465d7 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
@@ -28,8 +28,18 @@ namespace Microsoft.Toolkit.Uwp.Notifications
     /// </summary>
     public class DesktopNotificationManagerCompat
     {
+        private const string TOAST_ACTIVATED_LAUNCH_ARG = "-ToastActivated";
+
+        private const int CLASS_E_NOAGGREGATION = -2147221232;
+        private const int E_NOINTERFACE = -2147467262;
+        private const int CLSCTX_LOCAL_SERVER = 4;
+        private const int REGCLS_MULTIPLEUSE = 1;
+        private const int S_OK = 0;
+        private static readonly Guid IUnknownGuid = new Guid("00000000-0000-0000-C000-000000000046");
+
         private static bool _registeredOnActivated;
         private static List<OnActivated> _onActivated = new List<OnActivated>();
+
         /// <summary>
         /// Event that is triggered when a notification or notification button is clicked.
         /// </summary>
@@ -88,18 +98,6 @@ internal static void OnActivatedInternal(string args, Internal.NotificationActiv
             }
         }
 
-        /// <summary>
-        /// A constant that is used as the launch arg when your EXE is launched from a toast notification.
-        /// </summary>
-        private const string TOAST_ACTIVATED_LAUNCH_ARG = "-ToastActivated";
-
-        private const int CLASS_E_NOAGGREGATION = -2147221232;
-        private const int E_NOINTERFACE = -2147467262;
-        private const int CLSCTX_LOCAL_SERVER = 4;
-        private const int REGCLS_MULTIPLEUSE = 1;
-        private const int S_OK = 0;
-        private static readonly Guid IUnknownGuid = new Guid("00000000-0000-0000-C000-000000000046");
-
         private static string _aumid;
         private static string _win32Aumid;
 

From 9729ecac60d1dd85984b4f4a70596b4acdbc127d Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 20 Aug 2020 21:58:17 -0700
Subject: [PATCH 05/46] Icon from EXE works!

---
 .../DesktopNotificationManagerCompat.cs       |  54 ++++++-
 .../IconExtractor/IconExtractor.cs            | 150 ++++++++++++++++++
 .../IconExtractor/Kernel32.cs                 | 135 ++++++++++++++++
 3 files changed, 336 insertions(+), 3 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/IconExtractor.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/Kernel32.cs

diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
index de4378465d7..d74b77b1e75 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
@@ -15,8 +15,10 @@
 using System.Text.RegularExpressions;
 using System.Xml;
 using Microsoft.Win32;
+using Toolbelt.Drawing;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Resources;
+using Windows.Devices.Haptics;
 using Windows.Foundation.Collections;
 using Windows.UI;
 using Windows.UI.Notifications;
@@ -138,12 +140,20 @@ private static void Initialize()
             // Win32 app display names come from their process name
             string displayName = GetDisplayNameFromCurrentProcess(currProcess);
 
-            string iconPath = "C:\\icon.png"; // TODO: Need to grab icon from process name
+            string iconPath = GetIconPathFromCurrentProcess(currProcess);
 
             using (var rootKey = Registry.CurrentUser.CreateSubKey(@"Software\Classes\AppUserModelId\" + _aumid))
             {
                 rootKey.SetValue("DisplayName", displayName);
-                rootKey.SetValue("IconUri", iconPath);
+
+                if (iconPath != null)
+                {
+                    rootKey.SetValue("IconUri", iconPath);
+                }
+                else
+                {
+                    rootKey.DeleteValue("IconUri");
+                }
 
                 // Background color only appears in the settings page, format is
                 // hex without leading #, like "FFDDDDDD"
@@ -161,7 +171,15 @@ private static string GetAumidFromCurrentProcess(Process process)
             // the GUID is a hash of the exe path, launch args, and maybe display name (i'd have to double check)
 
             // Temporarily we'll just use a hash of the file name
-            return process.MainModule.FileName.GetHashCode().ToString();
+            var hashCode = process.MainModule.FileName.GetHashCode();
+            if (hashCode < 0)
+            {
+                return $"Neg{hashCode}";
+            }
+            else
+            {
+                return hashCode.ToString();
+            }
         }
 
         private static string GetDisplayNameFromCurrentProcess(Process process)
@@ -173,6 +191,36 @@ private static string GetDisplayNameFromCurrentProcess(Process process)
             return process.ProcessName;
         }
 
+        private static string GetIconPathFromCurrentProcess(Process process)
+        {
+            try
+            {
+                var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "DesktopNotificationManagerCompat", "Apps", _aumid, "Icon.png");
+
+                // Ensure the directories exist
+                Directory.CreateDirectory(Path.GetDirectoryName(path));
+
+                bool extracted = false;
+                using (var stream = File.Create(path))
+                {
+                    IconExtractor.Extract1stIconTo(Process.GetCurrentProcess().MainModule.FileName, stream);
+                    extracted = stream.Length > 0;
+                }
+
+                if (!extracted)
+                {
+                    File.Delete(path);
+                    return null;
+                }
+
+                return path;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
         private static Type CreateActivatorType(string aumid)
         {
             // https://stackoverflow.com/questions/24069352/c-sharp-typebuilder-generate-class-with-function-dynamically
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/IconExtractor.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/IconExtractor.cs
new file mode 100644
index 00000000000..2c9a516dc2f
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/IconExtractor.cs
@@ -0,0 +1,150 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#pragma warning disable SA1503 // Braces should not be omitted
+#pragma warning disable SA1117 // Parameters should be on same line or separate lines
+#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
+#pragma warning disable SA1407 // Arithmetic expressions should declare precedence
+#pragma warning disable SA1121 // Use built-in type alias
+#pragma warning disable SA1400 // Access modifier should be declared
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using Toolbelt.Drawing.Win32;
+
+namespace Toolbelt.Drawing
+{
+    /// <summary>
+    /// Extract .ico file
+    /// </summary>
+    internal class IconExtractor
+    {
+        /// <summary>
+        /// Extract first .ico file from Win32 resource of PE format file (.exe, .dll).
+        /// </summary>
+        /// <param name="sourceFile">path of PE format file to extract .ico file</param>
+        /// <param name="stream">stream that written to .ico file which is extracted.</param>
+        public static void Extract1stIconTo(string sourceFile, Stream stream)
+        {
+            var hModule = Kernel32.LoadLibraryEx(sourceFile, IntPtr.Zero, LOAD_LIBRARY.AS_DATAFILE);
+            if (hModule == null) throw new Win32Exception();
+
+            try
+            {
+                Kernel32.EnumResourceNames(hModule, RT.GROUP_ICON,
+                    (IntPtr _hModule, RT type, IntPtr lpszName, IntPtr lParam) =>
+                    {
+                        var iconResInfos = GetIconResInfo(_hModule, lpszName);
+                        WriteIconData(hModule, iconResInfos, stream);
+                        return false;
+                    }, IntPtr.Zero);
+            }
+            finally
+            {
+                Kernel32.FreeLibrary(hModule);
+            }
+        }
+
+        private static ICONRESINF[] GetIconResInfo(IntPtr hModule, IntPtr lpszName)
+        {
+            var hResInf = Kernel32.FindResource(hModule, lpszName, RT.GROUP_ICON);
+            if (hResInf == null) throw new Win32Exception();
+
+            var hResource = Kernel32.LoadResource(hModule, hResInf);
+            if (hResource == null) throw new Win32Exception();
+
+            var ptrResource = Kernel32.LockResource(hResource);
+            if (ptrResource == null) throw new Win32Exception();
+
+            var iconResHead = (ICONRESHEAD)Marshal.PtrToStructure(ptrResource, typeof(ICONRESHEAD));
+            var s1 = Marshal.SizeOf(typeof(ICONRESHEAD));
+            var s2 = Marshal.SizeOf(typeof(ICONRESINF));
+
+            var iconResInfos = Enumerable.Range(0, iconResHead.Count)
+                .Select(i => (ICONRESINF)Marshal.PtrToStructure(ptrResource + s1 + s2 * i, typeof(ICONRESINF)))
+                .ToArray();
+
+            return iconResInfos;
+        }
+
+        private static void WriteIconData(IntPtr hModule, ICONRESINF[] iconResInfos, Stream stream)
+        {
+            var s1 = Marshal.SizeOf(typeof(ICONFILEHEAD));
+            var s2 = Marshal.SizeOf(typeof(ICONFILEINF));
+            var address = s1 + s2 * iconResInfos.Length;
+
+            var iconFiles = iconResInfos
+                .Select(iconResInf =>
+                {
+                    var iconBytes = GetResourceBytes(hModule, (IntPtr)iconResInf.ID, RT.ICON);
+                    var iconFileInf = new ICONFILEINF
+                    {
+                        Cx = iconResInf.Cx,
+                        Cy = iconResInf.Cy,
+                        ColorCount = iconResInf.ColorCount,
+                        Planes = iconResInf.Planes,
+                        BitCount = iconResInf.BitCount,
+                        Size = iconResInf.Size,
+                        Address = (UInt32)address
+                    };
+                    address += iconBytes.Length;
+                    return new { iconBytes, iconFileInf };
+                }).ToList();
+
+            // write headers
+            var iconFileHead = new ICONFILEHEAD
+            {
+                Type = 1,
+                Count = (UInt16)iconResInfos.Length
+            };
+            var iconFileHeadBytes = StructureToBytes(iconFileHead);
+            stream.Write(iconFileHeadBytes, 0, iconFileHeadBytes.Length);
+            iconFiles.ForEach(iconFile =>
+            {
+                var bytes = StructureToBytes(iconFile.iconFileInf);
+                stream.Write(bytes, 0, bytes.Length);
+            });
+
+            // write images
+            iconFiles.ForEach(iconFile =>
+            {
+                stream.Write(iconFile.iconBytes, 0, iconFile.iconBytes.Length);
+            });
+        }
+
+        static byte[] GetResourceBytes(IntPtr hModule, IntPtr lpszName, RT type)
+        {
+            var hResInf = Kernel32.FindResource(hModule, lpszName, type);
+            if (hResInf == null) throw new Win32Exception();
+
+            var hResource = Kernel32.LoadResource(hModule, hResInf);
+            if (hResource == null) throw new Win32Exception();
+
+            var ptrResource = Kernel32.LockResource(hResource);
+            if (ptrResource == null) throw new Win32Exception();
+
+            var size = Kernel32.SizeofResource(hModule, hResInf);
+            var buff = new byte[size];
+            Marshal.Copy(ptrResource, buff, 0, buff.Length);
+
+            return buff;
+        }
+
+        private static byte[] StructureToBytes(object obj)
+        {
+            // http://schima.hatenablog.com/entry/20090512/1242139542
+            var size = Marshal.SizeOf(obj);
+            var bytes = new byte[size];
+            var gch = GCHandle.Alloc(bytes, GCHandleType.Pinned);
+            Marshal.StructureToPtr(obj, gch.AddrOfPinnedObject(), false);
+            gch.Free();
+
+            return bytes;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/Kernel32.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/Kernel32.cs
new file mode 100644
index 00000000000..0e7417f9dc9
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/Kernel32.cs
@@ -0,0 +1,135 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#pragma warning disable SA1503 // Braces should not be omitted
+#pragma warning disable SA1117 // Parameters should be on same line or separate lines
+#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
+#pragma warning disable SA1407 // Arithmetic expressions should declare precedence
+#pragma warning disable SA1121 // Use built-in type alias
+#pragma warning disable SA1400 // Access modifier should be declared
+#pragma warning disable SA1512 // Single-line comments should not be followed by blank line
+#pragma warning disable SA1649 // File name should match first type name
+#pragma warning disable SA1515 // Single-line comment should be preceded by blank line
+#pragma warning disable SA1513 // Closing brace should be followed by blank line
+#pragma warning disable SA1005 // Single line comments should begin with single space
+#pragma warning disable SA1106 // Code should not contain empty statements
+#pragma warning disable SA1027 // Use tabs correctly
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Text;
+
+// http://www.pinvoke.net/
+
+namespace Toolbelt.Drawing.Win32
+{
+    [Flags]
+    internal enum LOAD_LIBRARY : uint
+    {
+        DONT_RESOLVE_DLL_REFERENCES = 0x00000001,
+        IGNORE_CODE_AUTHZ_LEVEL = 0x00000010,
+        AS_DATAFILE = 0x00000002,
+        AS_DATAFILE_EXCLUSIVE = 0x00000040,
+        AS_IMAGE_RESOURCE = 0x00000020,
+        WITH_ALTERED_SEARCH_PATH = 0x00000008
+    }
+
+    internal enum RT
+    {
+        CURSOR = 1,
+        BITMAP = 2,
+        ICON = 3,
+        MENU = 4,
+        DIALOG = 5,
+        STRING = 6,
+        FONTDIR = 7,
+        FONT = 8,
+        ACCELERATOR = 9,
+        RCDATA = 10,
+        MESSAGETABLE = 11,
+        GROUP_CURSOR = 12,
+        GROUP_ICON = 14,
+        VERSION = 16,
+        DLGINCLUDE = 17,
+        PLUGPLAY = 19,
+        VXD = 20,
+        ANICURSOR = 21,
+        ANIICON = 22,
+        HTML = 23,
+        MANIFEST = 24
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    [DebuggerDisplay("{Cx} x {Cy}, {BitCount}bit, {Size}bytes")]
+    internal struct ICONRESINF
+    {
+        public byte Cx;
+        public byte Cy;
+        public byte ColorCount;
+        public byte Reserved;
+        public UInt16 Planes;
+        public UInt16 BitCount;
+        public UInt32 Size;
+        public UInt16 ID;
+    };
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    internal struct ICONRESHEAD
+    {
+        public UInt16 Reserved;
+        public UInt16 Type;
+        public UInt16 Count;
+        // public ICONRESINF[] IconInf;
+    };
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    [DebuggerDisplay("{Cx} x {Cy}, {BitCount}bit, {Size}bytes")]
+    internal struct ICONFILEINF
+    {
+        public byte Cx;
+        public byte Cy;
+        public byte ColorCount;
+        public byte Reserved;
+        public UInt16 Planes;
+        public UInt16 BitCount;
+        public UInt32 Size;
+        public UInt32 Address;
+    };
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    internal struct ICONFILEHEAD
+    {
+        public UInt16 Reserved;
+        public UInt16 Type;
+        public UInt16 Count;
+        //ICONFILEINF	IconInf[];.
+    };
+
+    internal delegate bool EnumResNameProcDelegate(IntPtr hModule, RT lpszType, IntPtr lpszName, IntPtr lParam);
+
+    internal class Kernel32
+    {
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern IntPtr LoadLibraryEx(string lpFileName, IntPtr hReservedNull, LOAD_LIBRARY dwFlags);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern bool FreeLibrary(IntPtr hModule);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern bool EnumResourceNames(IntPtr hModule, RT type, EnumResNameProcDelegate lpEnumFunc, IntPtr lParam);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern IntPtr FindResource(IntPtr hModule, IntPtr lpszName, RT type);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern IntPtr LoadResource(IntPtr hModule, IntPtr hResInfo);
+
+        [DllImport("Kernel32.dll", SetLastError = true)]
+        public static extern IntPtr LockResource(IntPtr hResource);
+
+        [DllImport("Kernel32.dll", SetLastError = true)]
+        public static extern uint SizeofResource(IntPtr hModule, IntPtr hResInfo);
+    }
+}
\ No newline at end of file

From 6b64b85677c192277723b24bf80d37cf90a7744a Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 20 Aug 2020 22:26:11 -0700
Subject: [PATCH 06/46] Switch to using icon

---
 .../DesktopNotificationManagerCompat.cs       |  24 +--
 .../IconExtractor/IconExtractor.cs            | 150 ------------------
 .../IconExtractor/Kernel32.cs                 | 135 ----------------
 ...Microsoft.Toolkit.Uwp.Notifications.csproj |   1 +
 4 files changed, 7 insertions(+), 303 deletions(-)
 delete mode 100644 Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/IconExtractor.cs
 delete mode 100644 Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/Kernel32.cs

diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
index d74b77b1e75..aee6a55057a 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -171,15 +172,7 @@ private static string GetAumidFromCurrentProcess(Process process)
             // the GUID is a hash of the exe path, launch args, and maybe display name (i'd have to double check)
 
             // Temporarily we'll just use a hash of the file name
-            var hashCode = process.MainModule.FileName.GetHashCode();
-            if (hashCode < 0)
-            {
-                return $"Neg{hashCode}";
-            }
-            else
-            {
-                return hashCode.ToString();
-            }
+            return GenerateGuid(process.MainModule.FileName);
         }
 
         private static string GetDisplayNameFromCurrentProcess(Process process)
@@ -200,17 +193,12 @@ private static string GetIconPathFromCurrentProcess(Process process)
                 // Ensure the directories exist
                 Directory.CreateDirectory(Path.GetDirectoryName(path));
 
-                bool extracted = false;
-                using (var stream = File.Create(path))
-                {
-                    IconExtractor.Extract1stIconTo(Process.GetCurrentProcess().MainModule.FileName, stream);
-                    extracted = stream.Length > 0;
-                }
+                // Extract the icon
+                var icon = Icon.ExtractAssociatedIcon(process.MainModule.FileName);
 
-                if (!extracted)
+                using (var stream = File.Create(path))
                 {
-                    File.Delete(path);
-                    return null;
+                    icon.Save(stream);
                 }
 
                 return path;
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/IconExtractor.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/IconExtractor.cs
deleted file mode 100644
index 2c9a516dc2f..00000000000
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/IconExtractor.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#pragma warning disable SA1503 // Braces should not be omitted
-#pragma warning disable SA1117 // Parameters should be on same line or separate lines
-#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
-#pragma warning disable SA1407 // Arithmetic expressions should declare precedence
-#pragma warning disable SA1121 // Use built-in type alias
-#pragma warning disable SA1400 // Access modifier should be declared
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using Toolbelt.Drawing.Win32;
-
-namespace Toolbelt.Drawing
-{
-    /// <summary>
-    /// Extract .ico file
-    /// </summary>
-    internal class IconExtractor
-    {
-        /// <summary>
-        /// Extract first .ico file from Win32 resource of PE format file (.exe, .dll).
-        /// </summary>
-        /// <param name="sourceFile">path of PE format file to extract .ico file</param>
-        /// <param name="stream">stream that written to .ico file which is extracted.</param>
-        public static void Extract1stIconTo(string sourceFile, Stream stream)
-        {
-            var hModule = Kernel32.LoadLibraryEx(sourceFile, IntPtr.Zero, LOAD_LIBRARY.AS_DATAFILE);
-            if (hModule == null) throw new Win32Exception();
-
-            try
-            {
-                Kernel32.EnumResourceNames(hModule, RT.GROUP_ICON,
-                    (IntPtr _hModule, RT type, IntPtr lpszName, IntPtr lParam) =>
-                    {
-                        var iconResInfos = GetIconResInfo(_hModule, lpszName);
-                        WriteIconData(hModule, iconResInfos, stream);
-                        return false;
-                    }, IntPtr.Zero);
-            }
-            finally
-            {
-                Kernel32.FreeLibrary(hModule);
-            }
-        }
-
-        private static ICONRESINF[] GetIconResInfo(IntPtr hModule, IntPtr lpszName)
-        {
-            var hResInf = Kernel32.FindResource(hModule, lpszName, RT.GROUP_ICON);
-            if (hResInf == null) throw new Win32Exception();
-
-            var hResource = Kernel32.LoadResource(hModule, hResInf);
-            if (hResource == null) throw new Win32Exception();
-
-            var ptrResource = Kernel32.LockResource(hResource);
-            if (ptrResource == null) throw new Win32Exception();
-
-            var iconResHead = (ICONRESHEAD)Marshal.PtrToStructure(ptrResource, typeof(ICONRESHEAD));
-            var s1 = Marshal.SizeOf(typeof(ICONRESHEAD));
-            var s2 = Marshal.SizeOf(typeof(ICONRESINF));
-
-            var iconResInfos = Enumerable.Range(0, iconResHead.Count)
-                .Select(i => (ICONRESINF)Marshal.PtrToStructure(ptrResource + s1 + s2 * i, typeof(ICONRESINF)))
-                .ToArray();
-
-            return iconResInfos;
-        }
-
-        private static void WriteIconData(IntPtr hModule, ICONRESINF[] iconResInfos, Stream stream)
-        {
-            var s1 = Marshal.SizeOf(typeof(ICONFILEHEAD));
-            var s2 = Marshal.SizeOf(typeof(ICONFILEINF));
-            var address = s1 + s2 * iconResInfos.Length;
-
-            var iconFiles = iconResInfos
-                .Select(iconResInf =>
-                {
-                    var iconBytes = GetResourceBytes(hModule, (IntPtr)iconResInf.ID, RT.ICON);
-                    var iconFileInf = new ICONFILEINF
-                    {
-                        Cx = iconResInf.Cx,
-                        Cy = iconResInf.Cy,
-                        ColorCount = iconResInf.ColorCount,
-                        Planes = iconResInf.Planes,
-                        BitCount = iconResInf.BitCount,
-                        Size = iconResInf.Size,
-                        Address = (UInt32)address
-                    };
-                    address += iconBytes.Length;
-                    return new { iconBytes, iconFileInf };
-                }).ToList();
-
-            // write headers
-            var iconFileHead = new ICONFILEHEAD
-            {
-                Type = 1,
-                Count = (UInt16)iconResInfos.Length
-            };
-            var iconFileHeadBytes = StructureToBytes(iconFileHead);
-            stream.Write(iconFileHeadBytes, 0, iconFileHeadBytes.Length);
-            iconFiles.ForEach(iconFile =>
-            {
-                var bytes = StructureToBytes(iconFile.iconFileInf);
-                stream.Write(bytes, 0, bytes.Length);
-            });
-
-            // write images
-            iconFiles.ForEach(iconFile =>
-            {
-                stream.Write(iconFile.iconBytes, 0, iconFile.iconBytes.Length);
-            });
-        }
-
-        static byte[] GetResourceBytes(IntPtr hModule, IntPtr lpszName, RT type)
-        {
-            var hResInf = Kernel32.FindResource(hModule, lpszName, type);
-            if (hResInf == null) throw new Win32Exception();
-
-            var hResource = Kernel32.LoadResource(hModule, hResInf);
-            if (hResource == null) throw new Win32Exception();
-
-            var ptrResource = Kernel32.LockResource(hResource);
-            if (ptrResource == null) throw new Win32Exception();
-
-            var size = Kernel32.SizeofResource(hModule, hResInf);
-            var buff = new byte[size];
-            Marshal.Copy(ptrResource, buff, 0, buff.Length);
-
-            return buff;
-        }
-
-        private static byte[] StructureToBytes(object obj)
-        {
-            // http://schima.hatenablog.com/entry/20090512/1242139542
-            var size = Marshal.SizeOf(obj);
-            var bytes = new byte[size];
-            var gch = GCHandle.Alloc(bytes, GCHandleType.Pinned);
-            Marshal.StructureToPtr(obj, gch.AddrOfPinnedObject(), false);
-            gch.Free();
-
-            return bytes;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/Kernel32.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/Kernel32.cs
deleted file mode 100644
index 0e7417f9dc9..00000000000
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/IconExtractor/Kernel32.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-#pragma warning disable SA1503 // Braces should not be omitted
-#pragma warning disable SA1117 // Parameters should be on same line or separate lines
-#pragma warning disable SA1313 // Parameter names should begin with lower-case letter
-#pragma warning disable SA1407 // Arithmetic expressions should declare precedence
-#pragma warning disable SA1121 // Use built-in type alias
-#pragma warning disable SA1400 // Access modifier should be declared
-#pragma warning disable SA1512 // Single-line comments should not be followed by blank line
-#pragma warning disable SA1649 // File name should match first type name
-#pragma warning disable SA1515 // Single-line comment should be preceded by blank line
-#pragma warning disable SA1513 // Closing brace should be followed by blank line
-#pragma warning disable SA1005 // Single line comments should begin with single space
-#pragma warning disable SA1106 // Code should not contain empty statements
-#pragma warning disable SA1027 // Use tabs correctly
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.Text;
-
-// http://www.pinvoke.net/
-
-namespace Toolbelt.Drawing.Win32
-{
-    [Flags]
-    internal enum LOAD_LIBRARY : uint
-    {
-        DONT_RESOLVE_DLL_REFERENCES = 0x00000001,
-        IGNORE_CODE_AUTHZ_LEVEL = 0x00000010,
-        AS_DATAFILE = 0x00000002,
-        AS_DATAFILE_EXCLUSIVE = 0x00000040,
-        AS_IMAGE_RESOURCE = 0x00000020,
-        WITH_ALTERED_SEARCH_PATH = 0x00000008
-    }
-
-    internal enum RT
-    {
-        CURSOR = 1,
-        BITMAP = 2,
-        ICON = 3,
-        MENU = 4,
-        DIALOG = 5,
-        STRING = 6,
-        FONTDIR = 7,
-        FONT = 8,
-        ACCELERATOR = 9,
-        RCDATA = 10,
-        MESSAGETABLE = 11,
-        GROUP_CURSOR = 12,
-        GROUP_ICON = 14,
-        VERSION = 16,
-        DLGINCLUDE = 17,
-        PLUGPLAY = 19,
-        VXD = 20,
-        ANICURSOR = 21,
-        ANIICON = 22,
-        HTML = 23,
-        MANIFEST = 24
-    }
-
-    [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    [DebuggerDisplay("{Cx} x {Cy}, {BitCount}bit, {Size}bytes")]
-    internal struct ICONRESINF
-    {
-        public byte Cx;
-        public byte Cy;
-        public byte ColorCount;
-        public byte Reserved;
-        public UInt16 Planes;
-        public UInt16 BitCount;
-        public UInt32 Size;
-        public UInt16 ID;
-    };
-
-    [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    internal struct ICONRESHEAD
-    {
-        public UInt16 Reserved;
-        public UInt16 Type;
-        public UInt16 Count;
-        // public ICONRESINF[] IconInf;
-    };
-
-    [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    [DebuggerDisplay("{Cx} x {Cy}, {BitCount}bit, {Size}bytes")]
-    internal struct ICONFILEINF
-    {
-        public byte Cx;
-        public byte Cy;
-        public byte ColorCount;
-        public byte Reserved;
-        public UInt16 Planes;
-        public UInt16 BitCount;
-        public UInt32 Size;
-        public UInt32 Address;
-    };
-
-    [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    internal struct ICONFILEHEAD
-    {
-        public UInt16 Reserved;
-        public UInt16 Type;
-        public UInt16 Count;
-        //ICONFILEINF	IconInf[];.
-    };
-
-    internal delegate bool EnumResNameProcDelegate(IntPtr hModule, RT lpszType, IntPtr lpszName, IntPtr lParam);
-
-    internal class Kernel32
-    {
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern IntPtr LoadLibraryEx(string lpFileName, IntPtr hReservedNull, LOAD_LIBRARY dwFlags);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern bool FreeLibrary(IntPtr hModule);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern bool EnumResourceNames(IntPtr hModule, RT type, EnumResNameProcDelegate lpEnumFunc, IntPtr lParam);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern IntPtr FindResource(IntPtr hModule, IntPtr lpszName, RT type);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern IntPtr LoadResource(IntPtr hModule, IntPtr hResInfo);
-
-        [DllImport("Kernel32.dll", SetLastError = true)]
-        public static extern IntPtr LockResource(IntPtr hResource);
-
-        [DllImport("Kernel32.dll", SetLastError = true)]
-        public static extern uint SizeofResource(IntPtr hModule, IntPtr hResInfo);
-    }
-}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index 3e72883b2ff..727fa5143ad 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -43,6 +43,7 @@
   <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.0'">
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
     <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
   </ItemGroup>
   
   <ItemGroup Condition=" '$(TargetFramework)' == 'native' ">

From f385bb383d041f9092f34b99d1c24c9da34322f0 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 20 Aug 2020 22:27:17 -0700
Subject: [PATCH 07/46] Fix compile error

---
 .../DesktopNotificationManagerCompat.cs                          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
index aee6a55057a..908a84b3263 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
@@ -16,7 +16,6 @@
 using System.Text.RegularExpressions;
 using System.Xml;
 using Microsoft.Win32;
-using Toolbelt.Drawing;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Resources;
 using Windows.Devices.Haptics;

From d4991659059246811d661cf6bf8fa196038be9cb Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 20 Aug 2020 22:40:38 -0700
Subject: [PATCH 08/46] Include icon in sample app

---
 ...rosoft.Toolkit.Win32.WpfCore.SampleApp.csproj |   1 +
 .../Office.ico                                   | Bin 0 -> 7886 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp/Office.ico

diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
index 560352b068c..1934c29378e 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
@@ -4,6 +4,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
+    <ApplicationIcon>Office.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Office.ico b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Office.ico
new file mode 100644
index 0000000000000000000000000000000000000000..527da4c0c98e0b3d72b738b8c30a21ba84931581
GIT binary patch
literal 7886
zcmcgx3vg7`89tXl5;m{RlO&sDHwg)WfQF(JijeRSsv-^Iqe3eYYjw1hNK0)MWfc_=
zFgOY#pbLl)p%4&|0^*_pAtA6po^)C^+Nm&Bn(!L1!|?SxySZ?4b8iv?CNtlh$36f5
zo&V(K-2eL{gdzfj!y(u@M6p$ffkKG*c>j1#cOg!2&PvGVPj(gJw~0bzaScsG9wFy{
zjGvx8_Bre^yYj+&?fY>EOg5ckKjFwus&;3@mx26<kKP1JrrV<osVgG#Ow4Y0dT`J0
ztOL`&b@jK`BRi=E8S&-h{|pI{8xd{&5ad?Tz`lzpAo!cP@t?e`v(6zI-#3sSe*W4f
z{@p(Qn6MQpw^1w4rm!Qs7~S`OId^9N;LYoO4ns0dL*?(AREx~`gK)&`Mq*?MV!~D$
z@#^P_u6GaQcatA2`RmAELH^Ilzp1_a=m39FtNgKU@^3~=_$qy@hU2#QcTB1CY%8ck
z$s@Ji;z_l6ZLQZn=kM5%Q#-F+Z`9v1xegnCU5m97Yq0X68oYOZwfn97svM)W`Z+C+
zSzm9XAFuyaEml8VgAX38#^MQ8DEdVuW{<7(>em^K%{aC5Mt0h{Rllsk(g&*X_V_By
z8&`>0cOSzGV~)1#z0vZR^|f3^{dXr+V_|+3=8Ua`^R8of?#`o_I{Zkd@h@P^uibMD
zGZ^z9M;^h`xgJaza=6p@UuMjI8GRImBaYySVIDj(_%QCjy`t0jr;j><-{pDm*d2#4
zanK>;52(QCTMu>`|C5Y)^3M+Afq{oGw*Ntl=vR(GS!JEZKZ!AqzpVm4&pC*p+2t6}
zs|<b8_IDcpy+5hI$Xm)WxOW+D%{YLp)US}?*w<<NxqZuVJ7dmH-;Ycm_g<vizic1>
zu;WnLfYIN)b}mQ8%=6A<%suU;NKg3!Y02*P@sIpFls2H{GV1qgin%9aPD|N?)a1|M
zNcs#ZwjFKeG0NTlfGO_cGs1{dJ9jna6gM2nyJ1h-CApE5xIJIH&Zw{4cLFUio^u))
z*=gsR$Gj8CiGL&ar$~(7+7RDkbE|t$Ce=fk*gCXaM*Y<0F~gRyjoe#6ZuE#NL0s&H
zhM1UjMN!ekExyUhZ~ld=c#M4m7;$Rn?6#dH$u@t?wuG%ni2sD#o5;Npv9W&zxj}A3
zMy-K0a<w<yy3!eDbvdLD<(Y4xJoE2s_&xhNXt|8~Ja21K!ly17bApVy2V;)gK<@R3
zj`^6}Ysvi)A|gKoxe*rOLP+>>Si;`*D1SbMR`J}aHs3#WPdx7&#_U#Oj+QY;Gv=t(
z<X(j^>k5QMd_eA{=pMER!68LZX8p$;ukab6`fqQ`^Ui0?-WD-OFy`<j=pOnuf<hLc
zo8>i#qW@mQo9yc`|MYd|-|9Yj-p+9AiUxno%NX-w1cxp}pk*$)T3$gw@beJM&O$6b
z(-KS0c*NqyLe*DC+t7&jt(NemuI{1lG{yWnx^{mF0YQI)Vw(xE_JSX4&U?k`^DeRK
zT!C15&e~BvGrPc$c{$xIuet+*UqF|jX;31kLCiW*A~szt6dNzL_`5XobEETJf}V9K
zfluY#h#y?Z1ug{v^<pOW2s>ZU2o;T}k7&%jPT09#B7#r|;UGlBW!10bkX(}U%1p>Q
z1xp!19@@>SQ}j+eR*)W7>P(8-lFvN+rv3g0rk~8~Z})op*ea18w->gkPY{;2OKL7R
zQAju##&!RU=zSq)Xl8?ZQ2HtKchsYgt*XiY7Q}|P(A8e@$T~;6;-Y?bj>^7>VZ9pA
z-2Xl#MQx>jQ{C!mEsz~kj{ErOzeMjp+g8o}e?|Y>=)YNAq?tZ7^S}Mkx`xfvp~aJG
zT&{<z9cJs)d7ecxzv@_hu5UL|->#v)eV-cho%^aV_uk3^{Tl69^`~#OYqWi-A*q{D
zL>(u!)brFc+UNSd-mf~=uT#g1xM!(NrB<3g>L{L~MpK^|wW>dTYqVC*QE&V7-?P+U
zj}JYJhkttLruvtfR%)yQ>YNGGc4OMmSNeUcW3&A~G1TMJZsVvWhEqS?#(dsvt(;f=
z>02`!sm-K58q%i>xAZ&!nKPTM?TCM=e+E+XN!=y2kIcne^?wK7e*>7=NR8pk^PBXA
z%<;|E`u0D9y21cvHh%5m*AKoN-sa1r9cJs5d#DWzV76XrqEu?4CS4-60TL6o7MiVB
z9`wQpX6w})T;~4Q^6yPD4|U0WOmC-5VXp1NH*ASV{m`#d$0@d*Zn<YQzm|EunrF)V
zmN}-(tBaUx<wzT4D)VYRm}{&4^ey#@mFMA<njy}YxBGKvnX{{TGjl0l{umtkmREW4
zJ2b-#jtRYA{g}QTF|q4i{yoc_T;|0xANS{nK_PGY^V0duMYWj6@f)XG{k~|qcpiB?
z54X%cE#dF^a^Ap@H<<f5nSV`(SkAmt#j-PAvE)pVSk!3M`e;v|`E-78$U<*7%j?W%
zXV7;cl>9Xi>n^xO@%cir=Dedle%e~Yys@B5&{U@q_;|k9{zJR=iLW8x%oSHekhn~o
z7eV;?N)YN>LU67*UgB6Hh3G=i_7Xu~pij`ZFAtL&kpXrj4;$e4#@aWj#+4fDc3U00
zoV-hY?`~UXA)gP+YIO4d3Jrae>yR4z1$soRRlnyl*KxJxi}{BqH|wnL{}Mj?xG!m6
ztlFz>gV{c4?^W&lB_BsxTq*6>sdiUez5N!}=vgE8vR<37e<sImeM@AHAajpbnICk-
zegW&^FS17aG{2)Av6ppDS>u%T&5qd1I-&e-56C>wA$wV8>&F^fhJCNG{cwJBB=Y>w
z?@`tT<#$njyI8Ym@vbT3SoazC&#Tbe%Q}zze#kqXwFWQmU?=Z(hq_Lg%sX5IbzW^{
zorHA?UwuU0v9c~AH99r2hj&zg@`sbSifJbeW0dtI-uqrzPhl;^cXwLCmQdTyhnRaB
zVonoge{cH!%Kb=f&ilMU)&c@8vw3&%PF!&g!gbawmYs3&K5TJ5Y8-0Id(Ya<GRs9x
y=~l)pcT&q5+FZ8R;Zi^y8k?}cv<~}Ah0vpvb9+iX*b{IF^#K*MDaU1d8U7CqG}}l3

literal 0
HcmV?d00001


From 1f770c188466fbd649d9560ed4df34d351b0015b Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 20 Aug 2020 23:05:19 -0700
Subject: [PATCH 09/46] High quality images

---
 .../DesktopNotificationManagerCompat.cs                      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
index 908a84b3263..8ba8f0825d3 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -195,9 +196,9 @@ private static string GetIconPathFromCurrentProcess(Process process)
                 // Extract the icon
                 var icon = Icon.ExtractAssociatedIcon(process.MainModule.FileName);
 
-                using (var stream = File.Create(path))
+                using (var bmp = icon.ToBitmap())
                 {
-                    icon.Save(stream);
+                    bmp.Save(path, ImageFormat.Png);
                 }
 
                 return path;

From 3800284d5c2496bf85f290e63b7aab7af8a0ac0b Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 28 Aug 2020 14:43:46 -0700
Subject: [PATCH 10/46] Switch to ToastCompat

---
 ...Microsoft.Toolkit.Uwp.Notifications.csproj |  10 +-
 .../Compat/Desktop/DesktopBridgeHelpers.cs    |  61 ++++
 .../DesktopNotificationHistoryCompat.cs       |   8 +-
 .../DesktopNotificationManagerCompat.cs       | 279 ++++++++++++++++++
 .../Desktop/InternalNotificationActivator.cs} |  16 +-
 .../Compat/Desktop/NotificationActivator.cs   |  85 ++++++
 .../Compat/Desktop}/NotificationUserInput.cs  |  16 +-
 .../Compat/Desktop}/OnActivated.cs            |  10 +-
 ...stNotificationActivatedEventArgsCompat.cs} |  12 +-
 .../Compat/ToastNotificationHistoryCompat.cs  | 101 +++++++
 .../Compat/ToastNotificationManagerCompat.cs} | 113 +++----
 .../App.xaml.cs                               |   6 +-
 .../MainWindow.xaml.cs                        |   2 +-
 13 files changed, 619 insertions(+), 100 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs
 rename Microsoft.Toolkit.Uwp.Notifications/{DesktopNotificationManager => Toasts/Compat/Desktop}/DesktopNotificationHistoryCompat.cs (95%)
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationManagerCompat.cs
 rename Microsoft.Toolkit.Uwp.Notifications/{DesktopNotificationManager/NotificationActivator.cs => Toasts/Compat/Desktop/InternalNotificationActivator.cs} (82%)
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/NotificationActivator.cs
 rename Microsoft.Toolkit.Uwp.Notifications/{DesktopNotificationManager => Toasts/Compat/Desktop}/NotificationUserInput.cs (85%)
 rename Microsoft.Toolkit.Uwp.Notifications/{DesktopNotificationManager => Toasts/Compat/Desktop}/OnActivated.cs (69%)
 rename Microsoft.Toolkit.Uwp.Notifications/{DesktopNotificationManager/DesktopNotificationActivatedEventArgs.cs => Toasts/Compat/Desktop/ToastNotificationActivatedEventArgsCompat.cs} (81%)
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationHistoryCompat.cs
 rename Microsoft.Toolkit.Uwp.Notifications/{DesktopNotificationManager/DesktopNotificationManagerCompat.cs => Toasts/Compat/ToastNotificationManagerCompat.cs} (84%)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index 727fa5143ad..c7ed58f4081 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -25,18 +25,10 @@
       </ItemGroup>
       <PropertyGroup>
         <!--Define the WINDOWS_UWP conditional symbol, since the Windows.Data.Xml and the Windows.UI.Notification namespaces are available-->
-        <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
+        <DefineConstants>$(DefineConstants);WINDOWS_UWP;WIN32</DefineConstants>
       </PropertyGroup>
     </When>
 
-    <!--Non-desktop apps (UWP, libraries, ASP.NET servers)-->
-    <Otherwise>
-      <ItemGroup>
-        <!--Remove the DesktopNotificationManager code-->
-        <Compile Remove="DesktopNotificationManager\**\*" />
-      </ItemGroup>
-    </Otherwise>
-
   </Choose>
 
   <!--NET Core desktop apps also need the Registry NuGet package and System.Reflection.Emit for generating COM class dynamically-->
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs
new file mode 100644
index 00000000000..93b4da40ee2
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs
@@ -0,0 +1,61 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if WIN32
+
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    /// <summary>
+    /// Code from https://github.com/qmatteoq/DesktopBridgeHelpers/edit/master/DesktopBridge.Helpers/Helpers.cs
+    /// </summary>
+    internal class DesktopBridgeHelpers
+    {
+        private const long APPMODEL_ERROR_NO_PACKAGE = 15700L;
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern int GetCurrentPackageFullName(ref int packageFullNameLength, StringBuilder packageFullName);
+
+        private static bool? _isRunningAsUwp;
+
+        public static bool IsRunningAsUwp()
+        {
+            if (_isRunningAsUwp == null)
+            {
+                if (IsWindows7OrLower)
+                {
+                    _isRunningAsUwp = false;
+                }
+                else
+                {
+                    int length = 0;
+                    var sb = new StringBuilder(0);
+                    GetCurrentPackageFullName(ref length, sb);
+
+                    sb = new StringBuilder(length);
+                    int error = GetCurrentPackageFullName(ref length, sb);
+
+                    _isRunningAsUwp = error != APPMODEL_ERROR_NO_PACKAGE;
+                }
+            }
+
+            return _isRunningAsUwp.Value;
+        }
+
+        private static bool IsWindows7OrLower
+        {
+            get
+            {
+                int versionMajor = Environment.OSVersion.Version.Major;
+                int versionMinor = Environment.OSVersion.Version.Minor;
+                double version = versionMajor + ((double)versionMinor / 10);
+                return version <= 6.1;
+            }
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationHistoryCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationHistoryCompat.cs
similarity index 95%
rename from Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationHistoryCompat.cs
rename to Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationHistoryCompat.cs
index 77d9f29c154..611ab96edc7 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationHistoryCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationHistoryCompat.cs
@@ -2,6 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if WIN32
+
+using System;
 using System.Collections.Generic;
 using Windows.UI.Notifications;
 
@@ -10,6 +13,7 @@ namespace Microsoft.Toolkit.Uwp.Notifications
     /// <summary>
     /// Manages the toast notifications for an app including the ability the clear all toast history and removing individual toasts.
     /// </summary>
+    [Obsolete("We recommend switching to the new ToastNotificationManagerCompat and ToastNotificationHistoryCompat.")]
     public sealed class DesktopNotificationHistoryCompat
     {
         private string _aumid;
@@ -99,4 +103,6 @@ public void RemoveGroup(string group)
             }
         }
     }
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationManagerCompat.cs
new file mode 100644
index 00000000000..3ee255458c7
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationManagerCompat.cs
@@ -0,0 +1,279 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if WIN32
+
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Text;
+using Windows.UI.Notifications;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    /// <summary>
+    /// Helper for .NET Framework applications to display toast notifications and respond to toast events
+    /// </summary>
+    [Obsolete("We recommend switching to the new ToastNotificationManagerCompat. For Win32 apps, it no longer requires a Start menu shortcut, and activation now uses a straightforward event handler (no NotificationActivator class and COM GUIDs needed)!")]
+    public class DesktopNotificationManagerCompat
+    {
+        /// <summary>
+        /// A constant that is used as the launch arg when your EXE is launched from a toast notification.
+        /// </summary>
+        public const string ToastActivatedLaunchArg = "-ToastActivated";
+
+        private const int CLASS_E_NOAGGREGATION = -2147221232;
+        private const int E_NOINTERFACE = -2147467262;
+        private const int CLSCTX_LOCAL_SERVER = 4;
+        private const int REGCLS_MULTIPLEUSE = 1;
+        private const int S_OK = 0;
+        private static readonly Guid IUnknownGuid = new Guid("00000000-0000-0000-C000-000000000046");
+
+        private static bool _registeredAumidAndComServer;
+        private static string _aumid;
+        private static bool _registeredActivator;
+
+        /// <summary>
+        /// If you're not using MSIX or sparse packages, you must call this method to register your AUMID with the Compat library and to
+        /// register your COM CLSID and EXE in LocalServer32 registry. Feel free to call this regardless, and we will no-op if running
+        /// under Desktop Bridge. Call this upon application startup, before calling any other APIs.
+        /// </summary>
+        /// <typeparam name="T">Your implementation of NotificationActivator. Must have GUID and ComVisible attributes on class.</typeparam>
+        /// <param name="aumid">An AUMID that uniquely identifies your application.</param>
+        public static void RegisterAumidAndComServer<T>(string aumid)
+            where T : NotificationActivator
+        {
+            if (string.IsNullOrWhiteSpace(aumid))
+            {
+                throw new ArgumentException("You must provide an AUMID.", nameof(aumid));
+            }
+
+            // If running as Desktop Bridge
+            if (DesktopBridgeHelpers.IsRunningAsUwp())
+            {
+                // Clear the AUMID since Desktop Bridge doesn't use it, and then we're done.
+                // Desktop Bridge apps are registered with platform through their manifest.
+                // Their LocalServer32 key is also registered through their manifest.
+                _aumid = null;
+                _registeredAumidAndComServer = true;
+                return;
+            }
+
+            _aumid = aumid;
+
+            string exePath = Process.GetCurrentProcess().MainModule.FileName;
+            RegisterComServer<T>(exePath);
+
+            _registeredAumidAndComServer = true;
+        }
+
+        private static void RegisterComServer<T>(string exePath)
+            where T : NotificationActivator
+        {
+            // We register the EXE to start up when the notification is activated
+            string regString = string.Format("SOFTWARE\\Classes\\CLSID\\{{{0}}}\\LocalServer32", typeof(T).GUID);
+            var key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(regString);
+
+            // Include a flag so we know this was a toast activation and should wait for COM to process
+            // We also wrap EXE path in quotes for extra security
+            key.SetValue(null, '"' + exePath + '"' + " " + ToastActivatedLaunchArg);
+        }
+
+        /*
+        * RegisterActivator code and all internal dependencies is from FrecherxDachs.
+        * See entry #2 in ThirdPartyNotices.txt in root repository directory for full license. */
+
+        /// <summary>
+        /// Registers the activator type as a COM server client so that Windows can launch your activator.
+        /// </summary>
+        /// <typeparam name="T">Your implementation of NotificationActivator. Must have GUID and ComVisible attributes on class.</typeparam>
+        public static void RegisterActivator<T>()
+            where T : NotificationActivator, new()
+        {
+            // Big thanks to FrecherxDachs for figuring out the following code which works in .NET Core 3: https://github.com/FrecherxDachs/UwpNotificationNetCoreTest
+            var uuid = typeof(T).GUID;
+            uint cookie;
+            CoRegisterClassObject(
+                uuid,
+                new NotificationActivatorClassFactory<T>(),
+                CLSCTX_LOCAL_SERVER,
+                REGCLS_MULTIPLEUSE,
+                out cookie);
+
+            _registeredActivator = true;
+        }
+
+        [ComImport]
+        [Guid("00000001-0000-0000-C000-000000000046")]
+        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        private interface IClassFactory
+        {
+            [PreserveSig]
+            int CreateInstance(IntPtr pUnkOuter, ref Guid riid, out IntPtr ppvObject);
+
+            [PreserveSig]
+            int LockServer(bool fLock);
+        }
+
+        private class NotificationActivatorClassFactory<T> : IClassFactory
+            where T : NotificationActivator, new()
+        {
+            public int CreateInstance(IntPtr pUnkOuter, ref Guid riid, out IntPtr ppvObject)
+            {
+                ppvObject = IntPtr.Zero;
+
+                if (pUnkOuter != IntPtr.Zero)
+                {
+                    Marshal.ThrowExceptionForHR(CLASS_E_NOAGGREGATION);
+                }
+
+                if (riid == typeof(T).GUID || riid == IUnknownGuid)
+                {
+                    // Create the instance of the .NET object
+                    ppvObject = Marshal.GetComInterfaceForObject(
+                        new T(),
+                        typeof(NotificationActivator.INotificationActivationCallback));
+                }
+                else
+                {
+                    // The object that ppvObject points to does not support the
+                    // interface identified by riid.
+                    Marshal.ThrowExceptionForHR(E_NOINTERFACE);
+                }
+
+                return S_OK;
+            }
+
+            public int LockServer(bool fLock)
+            {
+                return S_OK;
+            }
+        }
+
+        [DllImport("ole32.dll")]
+        private static extern int CoRegisterClassObject(
+            [MarshalAs(UnmanagedType.LPStruct)] Guid rclsid,
+            [MarshalAs(UnmanagedType.IUnknown)] object pUnk,
+            uint dwClsContext,
+            uint flags,
+            out uint lpdwRegister);
+
+        /// <summary>
+        /// Creates a toast notifier. You must have called <see cref="RegisterActivator{T}"/> first (and also <see cref="RegisterAumidAndComServer(string)"/> if you're a classic Win32 app), or this will throw an exception.
+        /// </summary>
+        /// <returns><see cref="ToastNotifier"/></returns>
+        public static ToastNotifier CreateToastNotifier()
+        {
+            EnsureRegistered();
+
+            if (_aumid != null)
+            {
+                // Non-Desktop Bridge
+                return ToastNotificationManager.CreateToastNotifier(_aumid);
+            }
+            else
+            {
+                // Desktop Bridge
+                return ToastNotificationManager.CreateToastNotifier();
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="DesktopNotificationHistoryCompat"/> object. You must have called <see cref="RegisterActivator{T}"/> first (and also <see cref="RegisterAumidAndComServer(string)"/> if you're a classic Win32 app), or this will throw an exception.
+        /// </summary>
+        public static DesktopNotificationHistoryCompat History
+        {
+            get
+            {
+                EnsureRegistered();
+
+                return new DesktopNotificationHistoryCompat(_aumid);
+            }
+        }
+
+        private static void EnsureRegistered()
+        {
+            // If not registered AUMID yet
+            if (!_registeredAumidAndComServer)
+            {
+                // Check if Desktop Bridge
+                if (DesktopBridgeHelpers.IsRunningAsUwp())
+                {
+                    // Implicitly registered, all good!
+                    _registeredAumidAndComServer = true;
+                }
+                else
+                {
+                    // Otherwise, incorrect usage
+                    throw new Exception("You must call RegisterAumidAndComServer first.");
+                }
+            }
+
+            // If not registered activator yet
+            if (!_registeredActivator)
+            {
+                // Incorrect usage
+                throw new Exception("You must call RegisterActivator first.");
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether http images can be used within toasts. This is true if running with package identity (MSIX or sparse package).
+        /// </summary>
+        public static bool CanUseHttpImages
+        {
+            get { return DesktopBridgeHelpers.IsRunningAsUwp(); }
+        }
+
+        /// <summary>
+        /// Code from https://github.com/qmatteoq/DesktopBridgeHelpers/edit/master/DesktopBridge.Helpers/Helpers.cs
+        /// </summary>
+        private class DesktopBridgeHelpers
+        {
+            private const long APPMODEL_ERROR_NO_PACKAGE = 15700L;
+
+            [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+            private static extern int GetCurrentPackageFullName(ref int packageFullNameLength, StringBuilder packageFullName);
+
+            private static bool? _isRunningAsUwp;
+
+            public static bool IsRunningAsUwp()
+            {
+                if (_isRunningAsUwp == null)
+                {
+                    if (IsWindows7OrLower)
+                    {
+                        _isRunningAsUwp = false;
+                    }
+                    else
+                    {
+                        int length = 0;
+                        var sb = new StringBuilder(0);
+                        GetCurrentPackageFullName(ref length, sb);
+
+                        sb = new StringBuilder(length);
+                        int error = GetCurrentPackageFullName(ref length, sb);
+
+                        _isRunningAsUwp = error != APPMODEL_ERROR_NO_PACKAGE;
+                    }
+                }
+
+                return _isRunningAsUwp.Value;
+            }
+
+            private static bool IsWindows7OrLower
+            {
+                get
+                {
+                    int versionMajor = Environment.OSVersion.Version.Major;
+                    int versionMinor = Environment.OSVersion.Version.Minor;
+                    double version = versionMajor + ((double)versionMinor / 10);
+                    return version <= 6.1;
+                }
+            }
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationActivator.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/InternalNotificationActivator.cs
similarity index 82%
rename from Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationActivator.cs
rename to Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/InternalNotificationActivator.cs
index 0946b2be610..df4f32e7214 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationActivator.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/InternalNotificationActivator.cs
@@ -1,7 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if WIN32
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -14,14 +16,14 @@
 namespace Microsoft.Toolkit.Uwp.Notifications.Internal
 {
     /// <summary>
-    /// Apps must implement this activator to handle notification activation.
+    /// Do not use this class. It must be public so that reflection can properly activate it, but consider it internal.
     /// </summary>
-    public abstract class NotificationActivator : NotificationActivator.INotificationActivationCallback
+    public abstract class InternalNotificationActivator : InternalNotificationActivator.INotificationActivationCallback
     {
         /// <inheritdoc/>
-        public void Activate(string appUserModelId, string invokedArgs, NOTIFICATION_USER_INPUT_DATA[] data, uint dataCount)
+        public void Activate(string appUserModelId, string invokedArgs, InternalNotificationActivator.NOTIFICATION_USER_INPUT_DATA[] data, uint dataCount)
         {
-            DesktopNotificationManagerCompat.OnActivatedInternal(invokedArgs, data, appUserModelId);
+            ToastNotificationManagerCompat.OnActivatedInternal(invokedArgs, data, appUserModelId);
         }
 
         /// <summary>
@@ -69,4 +71,6 @@ void Activate(
                 uint dataCount);
         }
     }
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/NotificationActivator.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/NotificationActivator.cs
new file mode 100644
index 00000000000..bad53c9e1fd
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/NotificationActivator.cs
@@ -0,0 +1,85 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if WIN32
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using Windows.UI.Notifications;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    /// <summary>
+    /// Apps must implement this activator to handle notification activation.
+    /// </summary>
+    [Obsolete("You can now subscribe to activation by simpy using the ToastNotificationManagerCompat.OnActivated event. We recommend deleting your NotificationActivator and switching to using the event.")]
+    public abstract class NotificationActivator : NotificationActivator.INotificationActivationCallback
+    {
+        /// <inheritdoc/>
+        public void Activate(string appUserModelId, string invokedArgs, NOTIFICATION_USER_INPUT_DATA[] data, uint dataCount)
+        {
+            OnActivated(invokedArgs, new NotificationUserInput(data), appUserModelId);
+        }
+
+        /// <summary>
+        /// This method will be called when the user clicks on a foreground or background activation on a toast. Parent app must implement this method.
+        /// </summary>
+        /// <param name="arguments">The arguments from the original notification. This is either the launch argument if the user clicked the body of your toast, or the arguments from a button on your toast.</param>
+        /// <param name="userInput">Text and selection values that the user entered in your toast.</param>
+        /// <param name="appUserModelId">Your AUMID.</param>
+        public abstract void OnActivated(string arguments, NotificationUserInput userInput, string appUserModelId);
+
+        /// <summary>
+        /// A single user input key/value pair.
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        [Serializable]
+        public struct NOTIFICATION_USER_INPUT_DATA
+        {
+            /// <summary>
+            /// The key of the user input.
+            /// </summary>
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string Key;
+
+            /// <summary>
+            /// The value of the user input.
+            /// </summary>
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string Value;
+        }
+
+        /// <summary>
+        /// The COM callback that is triggered when your notification is clicked.
+        /// </summary>
+        [ComImport]
+        [Guid("53E31837-6600-4A81-9395-75CFFE746F94")]
+        [ComVisible(true)]
+        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        public interface INotificationActivationCallback
+        {
+            /// <summary>
+            /// The method called when your notification is clicked.
+            /// </summary>
+            /// <param name="appUserModelId">The app id of the app that sent the toast.</param>
+            /// <param name="invokedArgs">The activation arguments from the toast.</param>
+            /// <param name="data">The user input from the toast.</param>
+            /// <param name="dataCount">The number of user inputs.</param>
+            void Activate(
+                [In, MarshalAs(UnmanagedType.LPWStr)]
+                string appUserModelId,
+                [In, MarshalAs(UnmanagedType.LPWStr)]
+                string invokedArgs, [In, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 3)] NOTIFICATION_USER_INPUT_DATA[] data,
+                [In, MarshalAs(UnmanagedType.U4)]
+                uint dataCount);
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationUserInput.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/NotificationUserInput.cs
similarity index 85%
rename from Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationUserInput.cs
rename to Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/NotificationUserInput.cs
index 25f7b6b3e0f..4a9c36770f7 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/NotificationUserInput.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/NotificationUserInput.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if WIN32
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -16,11 +18,15 @@ namespace Microsoft.Toolkit.Uwp.Notifications
     /// <summary>
     /// Text and selection values that the user entered on your notification. The Key is the ID of the input, and the Value is what the user entered.
     /// </summary>
-    internal class NotificationUserInput : IReadOnlyDictionary<string, string>
+    public class NotificationUserInput : IReadOnlyDictionary<string, string>
     {
-        private Internal.NotificationActivator.NOTIFICATION_USER_INPUT_DATA[] _data;
+#pragma warning disable CS0618 // Type or member is obsolete
+        private NotificationActivator.NOTIFICATION_USER_INPUT_DATA[] _data;
+#pragma warning restore CS0618 // Type or member is obsolete
 
-        internal NotificationUserInput(Internal.NotificationActivator.NOTIFICATION_USER_INPUT_DATA[] data)
+#pragma warning disable CS0618 // Type or member is obsolete
+        internal NotificationUserInput(NotificationActivator.NOTIFICATION_USER_INPUT_DATA[] data)
+#pragma warning restore CS0618 // Type or member is obsolete
         {
             _data = data;
         }
@@ -92,4 +98,6 @@ IEnumerator IEnumerable.GetEnumerator()
             return GetEnumerator();
         }
     }
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/OnActivated.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/OnActivated.cs
similarity index 69%
rename from Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/OnActivated.cs
rename to Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/OnActivated.cs
index c0d4a6c64a5..55e4204cc95 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/OnActivated.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/OnActivated.cs
@@ -1,12 +1,16 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if WIN32
+
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
     /// <summary>
     /// Event triggered when a notification is clicked.
     /// </summary>
     /// <param name="e">Arguments that specify what action was taken and the user inputs.</param>
-    public delegate void OnActivated(DesktopNotificationActivatedEventArgs e);
-}
\ No newline at end of file
+    public delegate void OnActivated(ToastNotificationActivatedEventArgsCompat e);
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationActivatedEventArgs.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/ToastNotificationActivatedEventArgsCompat.cs
similarity index 81%
rename from Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationActivatedEventArgs.cs
rename to Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/ToastNotificationActivatedEventArgsCompat.cs
index 99efec211f7..df60a4721f1 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationActivatedEventArgs.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/ToastNotificationActivatedEventArgsCompat.cs
@@ -1,7 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if WIN32
+
 using Windows.Foundation.Collections;
 
 namespace Microsoft.Toolkit.Uwp.Notifications
@@ -9,9 +11,9 @@ namespace Microsoft.Toolkit.Uwp.Notifications
     /// <summary>
     /// Provides information about an event that occurs when the app is activated because a user tapped on the body of a toast notification or performed an action inside a toast notification.
     /// </summary>
-    public class DesktopNotificationActivatedEventArgs
+    public class ToastNotificationActivatedEventArgsCompat
     {
-        internal DesktopNotificationActivatedEventArgs()
+        internal ToastNotificationActivatedEventArgsCompat()
         {
         }
 
@@ -25,4 +27,6 @@ internal DesktopNotificationActivatedEventArgs()
         /// </summary>
         public ValueSet UserInput { get; internal set; }
     }
-}
\ No newline at end of file
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationHistoryCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationHistoryCompat.cs
new file mode 100644
index 00000000000..0dbcec4c1ac
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationHistoryCompat.cs
@@ -0,0 +1,101 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if WINDOWS_UWP
+
+using System.Collections.Generic;
+using Windows.UI.Notifications;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    /// <summary>
+    /// Manages the toast notifications for an app including the ability the clear all toast history and removing individual toasts.
+    /// </summary>
+    public class ToastNotificationHistoryCompat
+    {
+        private string _aumid;
+        private ToastNotificationHistory _history;
+
+        internal ToastNotificationHistoryCompat(string aumid)
+        {
+            _aumid = aumid;
+            _history = ToastNotificationManager.History;
+        }
+
+        /// <summary>
+        /// Removes all notifications sent by this app from action center.
+        /// </summary>
+        public void Clear()
+        {
+            if (_aumid != null)
+            {
+                _history.Clear(_aumid);
+            }
+            else
+            {
+                _history.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Gets all notifications sent by this app that are currently still in Action Center.
+        /// </summary>
+        /// <returns>A collection of toasts.</returns>
+        public IReadOnlyList<ToastNotification> GetHistory()
+        {
+            return _aumid != null ? _history.GetHistory(_aumid) : _history.GetHistory();
+        }
+
+        /// <summary>
+        /// Removes an individual toast, with the specified tag label, from action center.
+        /// </summary>
+        /// <param name="tag">The tag label of the toast notification to be removed.</param>
+        public void Remove(string tag)
+        {
+            if (_aumid != null)
+            {
+                _history.Remove(tag, string.Empty, _aumid);
+            }
+            else
+            {
+                _history.Remove(tag);
+            }
+        }
+
+        /// <summary>
+        /// Removes a toast notification from the action using the notification's tag and group labels.
+        /// </summary>
+        /// <param name="tag">The tag label of the toast notification to be removed.</param>
+        /// <param name="group">The group label of the toast notification to be removed.</param>
+        public void Remove(string tag, string group)
+        {
+            if (_aumid != null)
+            {
+                _history.Remove(tag, group, _aumid);
+            }
+            else
+            {
+                _history.Remove(tag, group);
+            }
+        }
+
+        /// <summary>
+        /// Removes a group of toast notifications, identified by the specified group label, from action center.
+        /// </summary>
+        /// <param name="group">The group label of the toast notifications to be removed.</param>
+        public void RemoveGroup(string group)
+        {
+            if (_aumid != null)
+            {
+                _history.RemoveGroup(group, _aumid);
+            }
+            else
+            {
+                _history.RemoveGroup(group);
+            }
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
similarity index 84%
rename from Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
rename to Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
index 8ba8f0825d3..1afd8ffd99a 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -1,12 +1,12 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if WINDOWS_UWP
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -14,23 +14,19 @@
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
-using System.Text.RegularExpressions;
-using System.Xml;
 using Microsoft.Win32;
 using Windows.ApplicationModel;
-using Windows.ApplicationModel.Resources;
-using Windows.Devices.Haptics;
 using Windows.Foundation.Collections;
-using Windows.UI;
 using Windows.UI.Notifications;
 
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
     /// <summary>
-    /// Helper for .NET Framework applications to display toast notifications and respond to toast events
+    /// Provides access to sending and managing toast notifications. Works for all types of apps, even Win32 non-MSIX/sparse apps.
     /// </summary>
-    public class DesktopNotificationManagerCompat
+    public static class ToastNotificationManagerCompat
     {
+#if WIN32
         private const string TOAST_ACTIVATED_LAUNCH_ARG = "-ToastActivated";
 
         private const int CLASS_E_NOAGGREGATION = -2147221232;
@@ -71,7 +67,7 @@ public static event OnActivated OnActivated
             }
         }
 
-        internal static void OnActivatedInternal(string args, Internal.NotificationActivator.NOTIFICATION_USER_INPUT_DATA[] input, string aumid)
+        internal static void OnActivatedInternal(string args, Internal.InternalNotificationActivator.NOTIFICATION_USER_INPUT_DATA[] input, string aumid)
         {
             ValueSet userInput = new ValueSet();
 
@@ -83,7 +79,7 @@ internal static void OnActivatedInternal(string args, Internal.NotificationActiv
                 }
             }
 
-            var e = new DesktopNotificationActivatedEventArgs()
+            var e = new ToastNotificationActivatedEventArgsCompat()
             {
                 Argument = args,
                 UserInput = userInput
@@ -104,7 +100,7 @@ internal static void OnActivatedInternal(string args, Internal.NotificationActiv
         private static string _aumid;
         private static string _win32Aumid;
 
-        static DesktopNotificationManagerCompat()
+        static ToastNotificationManagerCompat()
         {
             Initialize();
         }
@@ -194,11 +190,11 @@ private static string GetIconPathFromCurrentProcess(Process process)
                 Directory.CreateDirectory(Path.GetDirectoryName(path));
 
                 // Extract the icon
-                var icon = Icon.ExtractAssociatedIcon(process.MainModule.FileName);
+                var icon = System.Drawing.Icon.ExtractAssociatedIcon(process.MainModule.FileName);
 
                 using (var bmp = icon.ToBitmap())
                 {
-                    bmp.Save(path, ImageFormat.Png);
+                    bmp.Save(path, System.Drawing.Imaging.ImageFormat.Png);
                 }
 
                 return path;
@@ -212,7 +208,7 @@ private static string GetIconPathFromCurrentProcess(Process process)
         private static Type CreateActivatorType(string aumid)
         {
             // https://stackoverflow.com/questions/24069352/c-sharp-typebuilder-generate-class-with-function-dynamically
-            // For .NET Core we're going to need https://stackoverflow.com/questions/36937276/is-there-any-replace-of-assemblybuilder-definedynamicassembly-in-net-core
+            // For .NET Core we use https://stackoverflow.com/questions/36937276/is-there-any-replace-of-assemblybuilder-definedynamicassembly-in-net-core
             AssemblyName aName = new AssemblyName("DynamicComActivator");
             AssemblyBuilder aBuilder = AssemblyBuilder.DefineDynamicAssembly(aName, AssemblyBuilderAccess.Run);
 
@@ -223,7 +219,7 @@ private static Type CreateActivatorType(string aumid)
             TypeBuilder tb = mb.DefineType(
                 name: "MyNotificationActivator",
                 attr: TypeAttributes.Public,
-                parent: typeof(Internal.NotificationActivator),
+                parent: typeof(Internal.InternalNotificationActivator),
                 interfaces: new Type[0]);
 
             string clsid;
@@ -249,7 +245,7 @@ private static Type CreateActivatorType(string aumid)
 #pragma warning disable CS0618 // Type or member is obsolete
                 con: typeof(ComSourceInterfacesAttribute).GetConstructor(new Type[] { typeof(Type) }),
 #pragma warning restore CS0618 // Type or member is obsolete
-                constructorArgs: new object[] { typeof(Internal.NotificationActivator.INotificationActivationCallback) }));
+                constructorArgs: new object[] { typeof(Internal.InternalNotificationActivator.INotificationActivationCallback) }));
 
             tb.SetCustomAttribute(new CustomAttributeBuilder(
                 con: typeof(ClassInterfaceAttribute).GetConstructor(new Type[] { typeof(ClassInterfaceType) }),
@@ -261,10 +257,10 @@ private static Type CreateActivatorType(string aumid)
         private static string GetClsidFromPackageManifest()
         {
             var appxManifestPath = Path.Combine(Package.Current.InstalledLocation.Path, "AppxManifest.xml");
-            XmlDocument doc = new XmlDocument();
+            var doc = new System.Xml.XmlDocument();
             doc.Load(appxManifestPath);
 
-            var namespaceManager = new XmlNamespaceManager(doc.NameTable);
+            var namespaceManager = new System.Xml.XmlNamespaceManager(doc.NameTable);
             namespaceManager.AddNamespace("default", "http://schemas.microsoft.com/appx/manifest/foundation/windows10");
             namespaceManager.AddNamespace("desktop", "http://schemas.microsoft.com/appx/manifest/desktop/windows10");
             namespaceManager.AddNamespace("com", "http://schemas.microsoft.com/appx/manifest/com/windows10");
@@ -408,7 +404,7 @@ public int CreateInstance(IntPtr pUnkOuter, ref Guid riid, out IntPtr ppvObject)
                     // Create the instance of the .NET object
                     ppvObject = Marshal.GetComInterfaceForObject(
                         Activator.CreateInstance(_activatorType),
-                        typeof(Internal.NotificationActivator.INotificationActivationCallback));
+                        typeof(Internal.InternalNotificationActivator.INotificationActivationCallback));
                 }
                 else
                 {
@@ -433,6 +429,7 @@ private static extern int CoRegisterClassObject(
             uint dwClsContext,
             uint flags,
             out uint lpdwRegister);
+#endif
 
         /// <summary>
         /// Creates a toast notifier.
@@ -440,6 +437,7 @@ private static extern int CoRegisterClassObject(
         /// <returns><see cref="ToastNotifier"/></returns>
         public static ToastNotifier CreateToastNotifier()
         {
+#if WIN32
             if (_win32Aumid != null)
             {
                 // Non-Desktop Bridge
@@ -450,64 +448,41 @@ public static ToastNotifier CreateToastNotifier()
                 // Desktop Bridge
                 return ToastNotificationManager.CreateToastNotifier();
             }
+#else
+            return ToastNotificationManager.CreateToastNotifier();
+#endif
         }
 
         /// <summary>
-        /// Gets the <see cref="DesktopNotificationHistoryCompat"/> object.
-        /// </summary>
-        public static DesktopNotificationHistoryCompat History => new DesktopNotificationHistoryCompat(_win32Aumid);
-
-        /// <summary>
-        /// Gets a value indicating whether http images can be used within toasts. This is true if running with package identity (MSIX or sparse package).
-        /// </summary>
-        public static bool CanUseHttpImages => DesktopBridgeHelpers.IsRunningAsUwp();
-
-        /// <summary>
-        /// Code from https://github.com/qmatteoq/DesktopBridgeHelpers/edit/master/DesktopBridge.Helpers/Helpers.cs
+        /// Gets the <see cref="ToastNotificationHistoryCompat"/> object.
         /// </summary>
-        private class DesktopBridgeHelpers
+        public static ToastNotificationHistoryCompat History
         {
-            private const long APPMODEL_ERROR_NO_PACKAGE = 15700L;
-
-            [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-            private static extern int GetCurrentPackageFullName(ref int packageFullNameLength, StringBuilder packageFullName);
-
-            private static bool? _isRunningAsUwp;
-
-            public static bool IsRunningAsUwp()
+            get
             {
-                if (_isRunningAsUwp == null)
-                {
-                    if (IsWindows7OrLower)
-                    {
-                        _isRunningAsUwp = false;
-                    }
-                    else
-                    {
-                        int length = 0;
-                        var sb = new StringBuilder(0);
-                        GetCurrentPackageFullName(ref length, sb);
-
-                        sb = new StringBuilder(length);
-                        int error = GetCurrentPackageFullName(ref length, sb);
-
-                        _isRunningAsUwp = error != APPMODEL_ERROR_NO_PACKAGE;
-                    }
-                }
-
-                return _isRunningAsUwp.Value;
+#if WIN32
+                return new ToastNotificationHistoryCompat(_win32Aumid);
+#else
+                return new ToastNotificationHistoryCompat(null);
+#endif
             }
+        }
 
-            private static bool IsWindows7OrLower
+        /// <summary>
+        /// Gets a value indicating whether http images can be used within toasts. This is true if running with package identity (UWP, MSIX, or sparse package).
+        /// </summary>
+        public static bool CanUseHttpImages
+        {
+            get
             {
-                get
-                {
-                    int versionMajor = Environment.OSVersion.Version.Major;
-                    int versionMinor = Environment.OSVersion.Version.Minor;
-                    double version = versionMajor + ((double)versionMinor / 10);
-                    return version <= 6.1;
-                }
+#if WIN32
+                return DesktopBridgeHelpers.IsRunningAsUwp();
+#else
+                return true;
+#endif
             }
         }
     }
 }
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
index bb4db7cd6e9..a7541af6458 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
@@ -15,15 +15,15 @@ public partial class App : Application
         protected override void OnStartup(StartupEventArgs e)
         {
             // Listen to toast notification activations
-            DesktopNotificationManagerCompat.OnActivated += this.DesktopNotificationManagerCompat_OnActivated;
+            ToastNotificationManagerCompat.OnActivated += this.ToastNotificationManagerCompat_OnActivated;
 
-            if (!DesktopNotificationManagerCompat.WasCurrentProcessToastActivated())
+            if (!ToastNotificationManagerCompat.WasCurrentProcessToastActivated())
             {
                 new MainWindow().Show();
             }
         }
 
-        private void DesktopNotificationManagerCompat_OnActivated(DesktopNotificationActivatedEventArgs e)
+        private void ToastNotificationManagerCompat_OnActivated(ToastNotificationActivatedEventArgsCompat e)
         {
             Dispatcher.Invoke(() =>
             {
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
index 8702dfb3781..49fbe369382 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
@@ -26,7 +26,7 @@ private void ButtonShowToast_Click(object sender, RoutedEventArgs e)
 
             var notif = new ToastNotification(content.GetXml());
 
-            DesktopNotificationManagerCompat.CreateToastNotifier().Show(notif);
+            ToastNotificationManagerCompat.CreateToastNotifier().Show(notif);
         }
     }
 }

From 4363829c267890fe1ce80d24212cd020c2ce26bf Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 28 Aug 2020 14:58:44 -0700
Subject: [PATCH 11/46] Use Compat API

---
 .../Toasts/Compat/ToastNotificationManagerCompat.cs             | 2 +-
 .../SamplePages/BackgroundTaskHelper/TestBackgroundTask.cs      | 2 +-
 .../SamplePages/Toast/ToastCode.bind                            | 2 +-
 .../SamplePages/Toast/ToastCodeJavaScript.bind                  | 2 +-
 .../SamplePages/Toast/ToastPage.xaml.cs                         | 2 +-
 .../WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind    | 2 +-
 .../WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs | 2 +-
 .../TestBackgroundTask.cs                                       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
index 1afd8ffd99a..b6f842c6d6a 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -40,7 +40,7 @@ public static class ToastNotificationManagerCompat
         private static List<OnActivated> _onActivated = new List<OnActivated>();
 
         /// <summary>
-        /// Event that is triggered when a notification or notification button is clicked.
+        /// Event that is triggered when a notification or notification button is clicked. Subscribe to this event in your app's initial startup code.
         /// </summary>
         public static event OnActivated OnActivated
         {
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BackgroundTaskHelper/TestBackgroundTask.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BackgroundTaskHelper/TestBackgroundTask.cs
index a523d439fb7..6cc55e2b72e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BackgroundTaskHelper/TestBackgroundTask.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BackgroundTaskHelper/TestBackgroundTask.cs
@@ -33,7 +33,7 @@ public void Run(IBackgroundTaskInstance taskInstance)
 
             // Create & show toast notification
             var toastNotification = new ToastNotification(toastContent.GetXml());
-            ToastNotificationManager.CreateToastNotifier().Show(toastNotification);
+            ToastNotificationManagerCompat.CreateToastNotifier().Show(toastNotification);
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
index 652201abfc7..507d65ba2a0 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
@@ -2,7 +2,7 @@ private void PopToast()
 {
     // Generate the toast notification content and pop the toast
     ToastContent content = GenerateToastContent();
-    ToastNotificationManager.CreateToastNotifier().Show(new ToastNotification(content.GetXml()));
+    ToastNotificationManagerCompat.CreateToastNotifier().Show(new ToastNotification(content.GetXml()));
 }
 
 public static ToastContent GenerateToastContent()
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCodeJavaScript.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCodeJavaScript.bind
index 00958686dd2..764fd1b6a24 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCodeJavaScript.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCodeJavaScript.bind
@@ -49,5 +49,5 @@ var popToast = function () {
     // generate the toast notification content and pop the toast
     var content = generateToastContent();
     var toast = new Windows.UI.Notifications.ToastNotification(content.getXml());
-    Windows.UI.Notifications.ToastNotificationManager.createToastNotifier().show(toast);
+    Windows.UI.Notifications.ToastNotificationManagerCompat.createToastNotifier().show(toast);
 };
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs
index e1815e625ee..440a81f313e 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs
@@ -54,7 +54,7 @@ private void ButtonPopToast_Click(object sender, RoutedEventArgs e)
 
         private void PopToast()
         {
-            ToastNotificationManager.CreateToastNotifier().Show(new ToastNotification(_toastContent.GetXml()));
+            ToastNotificationManagerCompat.CreateToastNotifier().Show(new ToastNotification(_toastContent.GetXml()));
         }
 
         private void Initialize()
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
index 26603452af9..36a0f22209b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
@@ -2,7 +2,7 @@ private void PopToast()
 {
     // Generate the toast notification content and pop the toast
     ToastContent content = GenerateToastContent();
-    ToastNotificationManager.CreateToastNotifier().Show(new ToastNotification(content.GetXml()));
+    ToastNotificationManagerCompat.CreateToastNotifier().Show(new ToastNotification(content.GetXml()));
 }
 
 private async void PinTile()
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
index d172b39aa34..f07cc156e78 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
@@ -290,7 +290,7 @@ private void ButtonPopToast_Click(object sender, RoutedEventArgs e)
 
         private void PopToast()
         {
-            ToastNotificationManager.CreateToastNotifier().Show(new ToastNotification(_toastContent.GetXml()));
+            ToastNotificationManagerCompat.CreateToastNotifier().Show(new ToastNotification(_toastContent.GetXml()));
         }
 
         private void Initialize()
diff --git a/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/TestBackgroundTask.cs b/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/TestBackgroundTask.cs
index 20682eceaf5..085295d1b57 100644
--- a/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/TestBackgroundTask.cs
+++ b/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/TestBackgroundTask.cs
@@ -33,7 +33,7 @@ public void Run(IBackgroundTaskInstance taskInstance)
 
             // Create & show toast notification
             var toastNotification = new ToastNotification(toastContent.GetXml());
-            ToastNotificationManager.CreateToastNotifier().Show(toastNotification);
+            ToastNotificationManagerCompat.CreateToastNotifier().Show(toastNotification);
         }
     }
 }

From 84b9bf34588cb73f937519e74a6a5566955d9b11 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 28 Aug 2020 17:47:21 -0700
Subject: [PATCH 12/46] Also check EXE path

---
 .../Compat/ToastNotificationManagerCompat.cs   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
index b6f842c6d6a..5cb88351a9e 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -282,10 +282,24 @@ private static string GetClsidFromPackageManifest()
                 throw new InvalidOperationException("Your app manifest must have a comServer extension with a class ID matching your toastNotificationActivator's CLSID.");
             }
 
-            var argumentsNode = comClassNode.ParentNode.Attributes.GetNamedItem("Arguments");
+            // Make sure they have a COM class registration matching their current process executable
+            var comExeServerNode = comClassNode.ParentNode;
+
+            var specifiedExeRelativePath = comExeServerNode.Attributes["Executable"].Value;
+            var specifiedExeFullPath = Path.Combine(Package.Current.InstalledLocation.Path, specifiedExeRelativePath);
+            var actualExeFullPath = Process.GetCurrentProcess().MainModule.FileName;
+
+            if (specifiedExeFullPath != actualExeFullPath)
+            {
+                var correctExeRelativePath = actualExeFullPath.Substring(Package.Current.InstalledLocation.Path.Length + 1);
+                throw new InvalidOperationException($"Your app manifest's comServer extension's Executable value is incorrect. It should be \"{correctExeRelativePath}\".");
+            }
+
+            // Make sure their arguments are set correctly
+            var argumentsNode = comExeServerNode.Attributes.GetNamedItem("Arguments");
             if (argumentsNode == null || argumentsNode.Value != "-ToastActivated")
             {
-                throw new InvalidOperationException("Your arguments on your comServer extension for toast activation must be set exactly to \"-ToastActivated\"");
+                throw new InvalidOperationException("Your app manifest's comServer extension for toast activation must have its Arguments set exactly to \"-ToastActivated\"");
             }
 
             return clsid;

From 1f0bc0014ba2975e4c48592654392a0a30a854de Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 28 Aug 2020 17:57:23 -0700
Subject: [PATCH 13/46] Sample app update

---
 .../App.xaml.cs                                 | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
index a7541af6458..6b6db82c635 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
@@ -27,10 +27,27 @@ private void ToastNotificationManagerCompat_OnActivated(ToastNotificationActivat
         {
             Dispatcher.Invoke(() =>
             {
+                OpenWindowIfNeeded();
+
                 var args = e.Argument;
                 var userInputCount = e.UserInput.Count;
                 MessageBox.Show("Activated!");
             });
         }
+
+        private void OpenWindowIfNeeded()
+        {
+            // Make sure we have a window open (in case user clicked toast while app closed)
+            if (App.Current.Windows.Count == 0)
+            {
+                new MainWindow().Show();
+            }
+
+            // Activate the window, bringing it to focus
+            App.Current.Windows[0].Activate();
+
+            // And make sure to maximize the window too, in case it was currently minimized
+            App.Current.Windows[0].WindowState = WindowState.Normal;
+        }
     }
 }

From 55a4332d59f557c62ad44b8f48637047c9e1959d Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 28 Aug 2020 20:50:24 -0700
Subject: [PATCH 14/46] First use AssemblyTitle for app name

---
 .../Toasts/Compat/ToastNotificationManagerCompat.cs      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
index 5cb88351a9e..303e3d8cc40 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -176,7 +176,14 @@ private static string GetDisplayNameFromCurrentProcess(Process process)
             // TODO: Should actually do the following which is what Shell does...
             // They look for the AppResolver shortcut first and use that, otherwise they pull it from the EXE
 
-            // Temporarily we'll just use the process name
+            // If AssemblyTitle is set, use that
+            var assemblyTitleAttr = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyTitleAttribute>();
+            if (assemblyTitleAttr != null)
+            {
+                return assemblyTitleAttr.Title;
+            }
+
+            // Otherwise, fall back to process name
             return process.ProcessName;
         }
 

From b8917c6dcb1ae4eb5e54b600a281f213a6ceb6b0 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 28 Aug 2020 21:57:15 -0700
Subject: [PATCH 15/46] Disable Win32 apps from release

---
 Windows Community Toolkit.sln | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index cdf9d63bc71..1724b73865e 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -1109,15 +1109,10 @@ Global
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x86.ActiveCfg = Debug|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x86.Build.0 = Debug|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.ActiveCfg = Release|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.Build.0 = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM64.Build.0 = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x64.ActiveCfg = Release|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x64.Build.0 = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x86.ActiveCfg = Release|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x86.Build.0 = Release|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -1149,20 +1144,10 @@ Global
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.Build.0 = Release|x86
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.Deploy.0 = Release|x86
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.ActiveCfg = Release|ARM
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.Build.0 = Release|ARM
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.Deploy.0 = Release|ARM
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM64.Build.0 = Release|ARM64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM64.Deploy.0 = Release|ARM64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x64.ActiveCfg = Release|x64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x64.Build.0 = Release|x64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x64.Deploy.0 = Release|x64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.ActiveCfg = Release|x86
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Build.0 = Release|x86
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Deploy.0 = Release|x86
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x64.ActiveCfg = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From dc1587cb52910a08718534d305f2960542df2ef9 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Mon, 31 Aug 2020 14:11:27 -0700
Subject: [PATCH 16/46] Add uninstall method

---
 .../Compat/ToastNotificationManagerCompat.cs  | 70 ++++++++++++++++++-
 .../App.xaml.cs                               |  6 ++
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
index 303e3d8cc40..a66b5e0ef76 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -191,7 +191,7 @@ private static string GetIconPathFromCurrentProcess(Process process)
         {
             try
             {
-                var path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "DesktopNotificationManagerCompat", "Apps", _aumid, "Icon.png");
+                var path = Path.Combine(GetAppDataFolderPath(), "Icon.png");
 
                 // Ensure the directories exist
                 Directory.CreateDirectory(Path.GetDirectoryName(path));
@@ -212,6 +212,15 @@ private static string GetIconPathFromCurrentProcess(Process process)
             }
         }
 
+        /// <summary>
+        /// Gets the app data folder path within the ToastNotificationManagerCompat folder, used for storing icon assets and any additional data.
+        /// </summary>
+        /// <returns>Returns a string of the absolute folder path.</returns>
+        private static string GetAppDataFolderPath()
+        {
+            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "ToastNotificationManagerCompat", "Apps", _aumid);
+        }
+
         private static Type CreateActivatorType(string aumid)
         {
             // https://stackoverflow.com/questions/24069352/c-sharp-typebuilder-generate-class-with-function-dynamically
@@ -503,6 +512,65 @@ public static bool CanUseHttpImages
 #endif
             }
         }
+
+#if WIN32
+        /// <summary>
+        /// Call this when your app is being uninstalled to properly clean up all notifications and notification-related resources. Note that this must be called from your app's main EXE (the one that you used notifications for) and not a separate uninstall EXE.
+        /// </summary>
+        public static void Uninstall()
+        {
+
+            try
+            {
+                // Remove all scheduled notifications (do this first before clearing current notifications)
+                var notifier = CreateToastNotifier();
+                foreach (var scheduled in CreateToastNotifier().GetScheduledToastNotifications())
+                {
+                    try
+                    {
+                        notifier.RemoveFromSchedule(scheduled);
+                    }
+                    catch
+                    {
+                    }
+                }
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                // Clear all current notifications
+                History.Clear();
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                // Remove registry key
+                Registry.CurrentUser.DeleteSubKey(@"Software\Classes\AppUserModelId\" + _aumid);
+            }
+            catch
+            {
+            }
+
+            try
+            {
+                // Delete any of the app files
+                var appDataFolderPath = GetAppDataFolderPath();
+                if (Directory.Exists(appDataFolderPath))
+                {
+                    Directory.Delete(appDataFolderPath, recursive: true);
+                }
+            }
+            catch
+            {
+            }
+        }
+#endif
     }
 }
 
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
index 6b6db82c635..2d0eb0118de 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
@@ -49,5 +49,11 @@ private void OpenWindowIfNeeded()
             // And make sure to maximize the window too, in case it was currently minimized
             App.Current.Windows[0].WindowState = WindowState.Normal;
         }
+
+        protected override void OnExit(ExitEventArgs e)
+        {
+            // If your app has an installer, you should call this when your app is uninstalled. Otherwise, if your app is a "portable app" and you no longer need notifications while the app is closed, you can call this upon exit.
+            ToastNotificationManagerCompat.Uninstall();
+        }
     }
 }

From aaba4e0bb7a6eb186e278b6c09ffc354a65692b7 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Mon, 31 Aug 2020 14:24:17 -0700
Subject: [PATCH 17/46] Disable uninstall when under MSIX

---
 .../Toasts/Compat/ToastNotificationManagerCompat.cs        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
index a66b5e0ef76..796518c6012 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -515,10 +515,15 @@ public static bool CanUseHttpImages
 
 #if WIN32
         /// <summary>
-        /// Call this when your app is being uninstalled to properly clean up all notifications and notification-related resources. Note that this must be called from your app's main EXE (the one that you used notifications for) and not a separate uninstall EXE.
+        /// If you're not using MSIX, call this when your app is being uninstalled to properly clean up all notifications and notification-related resources. Note that this must be called from your app's main EXE (the one that you used notifications for) and not a separate uninstall EXE. If called from a MSIX app, this method no-ops.
         /// </summary>
         public static void Uninstall()
         {
+            if (DesktopBridgeHelpers.IsRunningAsUwp())
+            {
+                // Packaged apps automatically clean everything up already
+                return;
+            }
 
             try
             {

From b62c96862b9e9e3e9a0eb10bf6a597194307d80b Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Tue, 1 Sep 2020 09:18:21 -0700
Subject: [PATCH 18/46] Enable building of WPF sample app

---
 Windows Community Toolkit.sln | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index 1724b73865e..ae64dd73df7 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -180,6 +180,8 @@ Global
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|x64.ActiveCfg = Release|x64
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|x86.ActiveCfg = Release|x86
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x86
+		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.Build.0 = Release|x86
+		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.Deploy.0 = Release|x86
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.ActiveCfg = Release|ARM
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Build.0 = Release|ARM
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Deploy.0 = Release|ARM
@@ -424,6 +426,7 @@ Global
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Native|x64.ActiveCfg = Release|x64
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Native|x86.ActiveCfg = Release|x86
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Release|ARM.ActiveCfg = Release|ARM
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Release|ARM.Build.0 = Release|ARM
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -1109,10 +1112,15 @@ Global
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x86.ActiveCfg = Debug|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x86.Build.0 = Debug|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.Build.0 = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM64.Build.0 = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x64.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x64.Build.0 = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x86.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x86.Build.0 = Release|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -1144,10 +1152,20 @@ Global
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.Build.0 = Release|x86
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.Deploy.0 = Release|x86
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.Deploy.0 = Release|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.Build.0 = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.Deploy.0 = Release|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM64.Build.0 = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM64.Deploy.0 = Release|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x64.ActiveCfg = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x64.Build.0 = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x64.Deploy.0 = Release|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.ActiveCfg = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Build.0 = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Deploy.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From efcf30e7d1bf90d7b14b5651a66353353eaf47c2 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Tue, 1 Sep 2020 10:24:47 -0700
Subject: [PATCH 19/46] Hide InternalNotificationActivator

---
 .../Toasts/Compat/Desktop/InternalNotificationActivator.cs       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/InternalNotificationActivator.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/InternalNotificationActivator.cs
index df4f32e7214..6ea57fd9475 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/InternalNotificationActivator.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/InternalNotificationActivator.cs
@@ -18,6 +18,7 @@ namespace Microsoft.Toolkit.Uwp.Notifications.Internal
     /// <summary>
     /// Do not use this class. It must be public so that reflection can properly activate it, but consider it internal.
     /// </summary>
+    [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
     public abstract class InternalNotificationActivator : InternalNotificationActivator.INotificationActivationCallback
     {
         /// <inheritdoc/>

From 1bfe408318708dc4836b11b6fcb373bbfffa80d4 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Tue, 1 Sep 2020 10:26:16 -0700
Subject: [PATCH 20/46] Remove unnecessary usings

---
 .../Toasts/Compat/Desktop/InternalNotificationActivator.cs  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/InternalNotificationActivator.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/InternalNotificationActivator.cs
index 6ea57fd9475..2e1dae172ef 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/InternalNotificationActivator.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/InternalNotificationActivator.cs
@@ -5,13 +5,7 @@
 #if WIN32
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using Windows.UI.Notifications;
 
 namespace Microsoft.Toolkit.Uwp.Notifications.Internal
 {

From a65c9ccc99b49a635a13df60be79af512c2abeab Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Tue, 1 Sep 2020 10:42:24 -0700
Subject: [PATCH 21/46] Build fixes and cleanup

---
 ...Microsoft.Toolkit.Uwp.Notifications.csproj |  6 +--
 .../Compat/Desktop/DesktopBridgeHelpers.cs    |  2 +-
 .../DesktopNotificationManagerCompat.cs       |  2 +-
 ...oft.Toolkit.Win32.WpfCore.SampleApp.csproj |  1 +
 ThirdPartyNotices.txt                         | 27 ++++++++++
 Windows Community Toolkit.sln                 | 49 +++++--------------
 6 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
index c7ed58f4081..fcf8f53bb43 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
+++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.4;uap10.0;native;net461;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.4;uap10.0;native;net461;netcoreapp3.1</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
     <Title>Windows Community Toolkit Notifications</Title>
     <Description>
@@ -18,7 +18,7 @@
   <Choose>
 
     <!--Desktop Win32 apps-->
-    <When Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='netcoreapp3.0'">
+    <When Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='netcoreapp3.1'">
       <ItemGroup>
         <!--Reference Windows SDK NuGet of correct target platform version-->
         <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000" />
@@ -32,7 +32,7 @@
   </Choose>
 
   <!--NET Core desktop apps also need the Registry NuGet package and System.Reflection.Emit for generating COM class dynamically-->
-  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
     <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs
index 93b4da40ee2..cd48c16d84f 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs
@@ -11,7 +11,7 @@
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
     /// <summary>
-    /// Code from https://github.com/qmatteoq/DesktopBridgeHelpers/edit/master/DesktopBridge.Helpers/Helpers.cs
+    /// Code from https://github.com/qmatteoq/DesktopBridgeHelpers/tree/master/DesktopBridge.Helpers/Helpers.cs
     /// </summary>
     internal class DesktopBridgeHelpers
     {
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationManagerCompat.cs
index 3ee255458c7..38359aa56dc 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopNotificationManagerCompat.cs
@@ -227,7 +227,7 @@ public static bool CanUseHttpImages
         }
 
         /// <summary>
-        /// Code from https://github.com/qmatteoq/DesktopBridgeHelpers/edit/master/DesktopBridge.Helpers/Helpers.cs
+        /// Code from https://github.com/qmatteoq/DesktopBridgeHelpers/tree/master/DesktopBridge.Helpers/Helpers.cs
         /// </summary>
         private class DesktopBridgeHelpers
         {
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
index 1934c29378e..5666136b585 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Office.ico</ApplicationIcon>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index a076d882249..05e23a2caf0 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -9,6 +9,7 @@ This project incorporates components from the projects listed below. The origina
 2.	MichaeIDietrich/UwpNotificationNetCoreTest commit 5c1a4a3 (https://github.com/MichaeIDietrich/UwpNotificationNetCoreTest), used in DesktopNotificationManagerCompat.cs to support .NET Core 3.0.
 3.	lbugnion/mvvmlight commit 4cbf77c (https://github.com/lbugnion/mvvmlight), from which some APIs from the `Microsoft.Toolkit.Mvvm` package take inspiration from.
 4.  PrivateObject/PrivateType (https://github.com/microsoft/testfx/tree/664ac7c2ac9dbfbee9d2a0ef560cfd72449dfe34/src/TestFramework/Extension.Desktop), included in UnitTests.
+5.  qmatteoq/DesktopBridgeHelpers commit e278153 (https://github.com/qmatteoq/DesktopBridgeHelpers), using in DesktopNotificationManagerCompat.cs and DesktopBridgeHelpers.cs to identify if running with identity.
 
 %% PedroLamas/DeferredEvents NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -112,3 +113,29 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
 END OF PrivateOject/PrivateType NOTICES AND INFORMATION
+
+%% qmatteoq/DesktopBridgeHelpers NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE
+=========================================
+END OF qmatteoq/DesktopBridgeHelpers NOTICES AND INFORMATION
\ No newline at end of file
diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index ae64dd73df7..dd53a2a853e 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -1101,16 +1101,6 @@ Global
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x64.Build.0 = Debug|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x86.Build.0 = Debug|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|Any CPU.Build.0 = Debug|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM.ActiveCfg = Debug|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM.Build.0 = Debug|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM64.ActiveCfg = Debug|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM64.Build.0 = Debug|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x64.ActiveCfg = Debug|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x64.Build.0 = Debug|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x86.ActiveCfg = Debug|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x86.Build.0 = Debug|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -1124,33 +1114,18 @@ Global
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.ActiveCfg = Debug|ARM
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.Build.0 = Debug|ARM
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.Deploy.0 = Debug|ARM
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.ActiveCfg = Debug|x64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.Build.0 = Debug|x64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.Deploy.0 = Debug|x64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.ActiveCfg = Debug|x86
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Build.0 = Debug|x86
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Deploy.0 = Debug|x86
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.ActiveCfg = Debug|Any CPU
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.Build.0 = Debug|Any CPU
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.Deploy.0 = Debug|Any CPU
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM.ActiveCfg = Release|ARM
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM.Build.0 = Release|ARM
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM.Deploy.0 = Release|ARM
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM64.ActiveCfg = Release|ARM64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM64.Build.0 = Release|ARM64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM64.Deploy.0 = Release|ARM64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x64.ActiveCfg = Release|x64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x64.Build.0 = Release|x64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x64.Deploy.0 = Release|x64
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.ActiveCfg = Release|x86
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.Build.0 = Release|x86
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.Deploy.0 = Release|x86
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM64.Deploy.0 = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.Build.0 = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Build.0 = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Deploy.0 = Debug|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.Deploy.0 = Release|Any CPU

From 252bbc05f3d6fb9caf7fb96dba57456e24251d38 Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Tue, 1 Sep 2020 17:04:44 -0700
Subject: [PATCH 22/46] Fix sln.

---
 Windows Community Toolkit.sln | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln
index dd53a2a853e..d55a0094339 100644
--- a/Windows Community Toolkit.sln	
+++ b/Windows Community Toolkit.sln	
@@ -90,7 +90,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeInputTest", "GazeInputT
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Media", "Microsoft.Toolkit.Uwp.UI.Media\Microsoft.Toolkit.Uwp.UI.Media.csproj", "{75F9EE44-3EFA-47BC-AEDD-351B9834A0AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Mvvm", "Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj", "{D82AE6E1-E612-434E-ACB2-363EE48738D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Mvvm", "Microsoft.Toolkit.Mvvm\Microsoft.Toolkit.Mvvm.csproj", "{D82AE6E1-E612-434E-ACB2-363EE48738D3}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UnitTests.Shared", "UnitTests\UnitTests.Shared\UnitTests.Shared.shproj", "{4E9466D1-D5AA-46AC-801B-C8FDAB79F0D4}"
 EndProject
@@ -180,8 +180,6 @@ Global
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|x64.ActiveCfg = Release|x64
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|x86.ActiveCfg = Release|x86
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x86
-		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.Build.0 = Release|x86
-		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.Deploy.0 = Release|x86
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.ActiveCfg = Release|ARM
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Build.0 = Release|ARM
 		{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Deploy.0 = Release|ARM
@@ -426,7 +424,6 @@ Global
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Native|x64.ActiveCfg = Release|x64
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Native|x86.ActiveCfg = Release|x86
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Release|ARM.ActiveCfg = Release|ARM
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Release|ARM.Build.0 = Release|ARM
 		{1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Release|ARM64.ActiveCfg = Release|ARM64
@@ -861,13 +858,9 @@ Global
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|Any CPU.ActiveCfg = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|Any CPU.Build.0 = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM.Build.0 = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM64.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|ARM64.Build.0 = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x64.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x64.Build.0 = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x86.ActiveCfg = Debug|Any CPU
-		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Native|x86.Build.0 = Debug|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D82AE6E1-E612-434E-ACB2-363EE48738D3}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -916,13 +909,9 @@ Global
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|Any CPU.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM64.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|ARM64.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x64.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x64.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x86.ActiveCfg = Debug|Any CPU
-		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Native|x86.Build.0 = Debug|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB444381-18BA-4A51-BB32-3A498BCC1E99}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -1101,8 +1090,13 @@ Global
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x64.Build.0 = Debug|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x86.Build.0 = Debug|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|Any CPU.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|Any CPU.Build.0 = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM64.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x64.ActiveCfg = Release|Any CPU
+		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x86.ActiveCfg = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.ActiveCfg = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.Build.0 = Release|Any CPU
 		{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM64.ActiveCfg = Release|Any CPU
@@ -1126,9 +1120,14 @@ Global
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Build.0 = Debug|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.ActiveCfg = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.Build.0 = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.Deploy.0 = Release|Any CPU
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM.ActiveCfg = Release|ARM
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM64.ActiveCfg = Release|ARM64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x64.ActiveCfg = Release|x64
+		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.ActiveCfg = Release|x86
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.Deploy.0 = Release|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.ActiveCfg = Release|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.Build.0 = Release|Any CPU
 		{54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.Deploy.0 = Release|Any CPU

From bb5b042185a3928d2801e2265f92432599760014 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Wed, 2 Sep 2020 13:47:35 -0700
Subject: [PATCH 23/46] Avoid double registration

---
 .../Toasts/Compat/ToastNotificationManagerCompat.cs         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
index 796518c6012..a77220edf71 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -128,8 +128,7 @@ private static void Initialize()
             }
 
             // Create and register activator
-            var activatorType = CreateActivatorType(_aumid);
-            RegisterActivator(activatorType);
+            var activatorType = CreateAndRegisterActivator();
 
             // Otherwise, register via registry
             var currProcess = Process.GetCurrentProcess();
@@ -354,11 +353,12 @@ private static string GenerateGuid(string name)
             return guidS;
         }
 
-        private static void CreateAndRegisterActivator()
+        private static Type CreateAndRegisterActivator()
         {
             var activatorType = CreateActivatorType(_aumid);
             RegisterActivator(activatorType);
             _registeredOnActivated = true;
+            return activatorType;
         }
 
         private static void RegisterActivator(Type activatorType)

From 2463bbda7b2d96364d321d7702cf1cee0076a935 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Wed, 2 Sep 2020 17:18:13 -0700
Subject: [PATCH 24/46] Sparse signed package support

---
 .../Compat/Desktop/DesktopBridgeHelpers.cs    |  53 ++++-
 .../Compat/ToastNotificationManagerCompat.cs  | 189 +++++++++++-------
 2 files changed, 161 insertions(+), 81 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs
index cd48c16d84f..6134db08869 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/DesktopBridgeHelpers.cs
@@ -5,8 +5,11 @@
 #if WIN32
 
 using System;
+using System.Diagnostics;
+using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
+using Windows.ApplicationModel;
 
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
@@ -20,15 +23,15 @@ internal class DesktopBridgeHelpers
         [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
         private static extern int GetCurrentPackageFullName(ref int packageFullNameLength, StringBuilder packageFullName);
 
-        private static bool? _isRunningAsUwp;
+        private static bool? _hasIdentity;
 
-        public static bool IsRunningAsUwp()
+        public static bool HasIdentity()
         {
-            if (_isRunningAsUwp == null)
+            if (_hasIdentity == null)
             {
                 if (IsWindows7OrLower)
                 {
-                    _isRunningAsUwp = false;
+                    _hasIdentity = false;
                 }
                 else
                 {
@@ -39,11 +42,49 @@ public static bool IsRunningAsUwp()
                     sb = new StringBuilder(length);
                     int error = GetCurrentPackageFullName(ref length, sb);
 
-                    _isRunningAsUwp = error != APPMODEL_ERROR_NO_PACKAGE;
+                    _hasIdentity = error != APPMODEL_ERROR_NO_PACKAGE;
                 }
             }
 
-            return _isRunningAsUwp.Value;
+            return _hasIdentity.Value;
+        }
+
+        private static bool? _isContainerized;
+
+        /// <summary>
+        /// Returns true if the app is running in a container (MSIX) or false if not running in a container (sparse or plain Win32)
+        /// </summary>
+        /// <returns>Boolean</returns>
+        public static bool IsContainerized()
+        {
+            if (_isContainerized == null)
+            {
+                // If MSIX or sparse
+                if (HasIdentity())
+                {
+                    // Sparse is identified if EXE is running outside of installed package location
+                    var packageInstalledLocation = Package.Current.InstalledLocation.Path;
+                    var actualExeFullPath = Process.GetCurrentProcess().MainModule.FileName;
+
+                    // If inside package location
+                    if (actualExeFullPath.StartsWith(packageInstalledLocation))
+                    {
+                        _isContainerized = true;
+                    }
+                    else
+                    {
+                        _isContainerized = false;
+                    }
+                }
+
+                // Plain Win32
+                else
+                {
+                    _isContainerized = false;
+                }
+            }
+
+            return _isContainerized.Value;
         }
 
         private static bool IsWindows7OrLower
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
index a77220edf71..b37cdb21d38 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -97,8 +97,8 @@ internal static void OnActivatedInternal(string args, Internal.InternalNotificat
             }
         }
 
-        private static string _aumid;
         private static string _win32Aumid;
+        private static string _clsid;
 
         static ToastNotificationManagerCompat()
         {
@@ -107,53 +107,55 @@ static ToastNotificationManagerCompat()
 
         private static void Initialize()
         {
-            if (DesktopBridgeHelpers.IsRunningAsUwp())
+            // If containerized
+            if (DesktopBridgeHelpers.IsContainerized())
             {
-                _aumid = Package.Current.Id.FamilyName;
+                // No need to do anything additional, already registered through manifest
+                return;
             }
-            else
-            {
-                // Win32 apps are uniquely identified based on their process name
-                _aumid = GetAumidFromCurrentProcess(Process.GetCurrentProcess());
 
-                // Store the AUMID for Win32 apps since it'll be needed later
-                _win32Aumid = _aumid;
+            // If sparse
+            if (DesktopBridgeHelpers.HasIdentity())
+            {
+                _win32Aumid = GetAumidFromPackageManifest();
             }
-
-            // If running as Desktop Bridge
-            if (DesktopBridgeHelpers.IsRunningAsUwp())
+            else
             {
-                // No need to do anything additional, already registered
-                return;
+                // Win32 apps are uniquely identified based on their process name
+                _win32Aumid = GetAumidFromCurrentProcess(Process.GetCurrentProcess());
             }
 
             // Create and register activator
             var activatorType = CreateAndRegisterActivator();
 
-            // Otherwise, register via registry
+            // Register via registry
             var currProcess = Process.GetCurrentProcess();
 
-            // Win32 app display names come from their process name
-            string displayName = GetDisplayNameFromCurrentProcess(currProcess);
+            using (var rootKey = Registry.CurrentUser.CreateSubKey(@"Software\Classes\AppUserModelId\" + _win32Aumid))
+            {
+                // If they don't have identity, we need to specify the display assets
+                if (!DesktopBridgeHelpers.HasIdentity())
+                {
+                    // Win32 app display names come from their process name
+                    string displayName = GetDisplayNameFromCurrentProcess(currProcess);
 
-            string iconPath = GetIconPathFromCurrentProcess(currProcess);
+                    string iconPath = GetIconPathFromCurrentProcess(currProcess);
 
-            using (var rootKey = Registry.CurrentUser.CreateSubKey(@"Software\Classes\AppUserModelId\" + _aumid))
-            {
-                rootKey.SetValue("DisplayName", displayName);
+                    rootKey.SetValue("DisplayName", displayName);
 
-                if (iconPath != null)
-                {
-                    rootKey.SetValue("IconUri", iconPath);
-                }
-                else
-                {
-                    rootKey.DeleteValue("IconUri");
-                }
+                    if (iconPath != null)
+                    {
+                        rootKey.SetValue("IconUri", iconPath);
+                    }
+                    else
+                    {
+                        rootKey.DeleteValue("IconUri");
+                    }
 
-                // Background color only appears in the settings page, format is
-                // hex without leading #, like "FFDDDDDD"
-                rootKey.SetValue("IconBackgroundColor", "FFDDDDDD");
+                    // Background color only appears in the settings page, format is
+                    // hex without leading #, like "FFDDDDDD"
+                    rootKey.SetValue("IconBackgroundColor", "FFDDDDDD");
+                }
 
                 rootKey.SetValue("CustomActivator", string.Format("{{{0}}}", activatorType.GUID));
             }
@@ -217,10 +219,10 @@ private static string GetIconPathFromCurrentProcess(Process process)
         /// <returns>Returns a string of the absolute folder path.</returns>
         private static string GetAppDataFolderPath()
         {
-            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "ToastNotificationManagerCompat", "Apps", _aumid);
+            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "ToastNotificationManagerCompat", "Apps", _win32Aumid);
         }
 
-        private static Type CreateActivatorType(string aumid)
+        private static Type CreateActivatorType()
         {
             // https://stackoverflow.com/questions/24069352/c-sharp-typebuilder-generate-class-with-function-dynamically
             // For .NET Core we use https://stackoverflow.com/questions/36937276/is-there-any-replace-of-assemblybuilder-definedynamicassembly-in-net-core
@@ -237,20 +239,18 @@ private static Type CreateActivatorType(string aumid)
                 parent: typeof(Internal.InternalNotificationActivator),
                 interfaces: new Type[0]);
 
-            string clsid;
-
-            if (DesktopBridgeHelpers.IsRunningAsUwp())
+            if (DesktopBridgeHelpers.IsContainerized())
             {
-                clsid = GetClsidFromPackageManifest();
+                _clsid = GetClsidFromPackageManifest();
             }
             else
             {
-                clsid = GenerateGuid(aumid);
+                _clsid = GenerateGuid(_win32Aumid);
             }
 
             tb.SetCustomAttribute(new CustomAttributeBuilder(
                 con: typeof(GuidAttribute).GetConstructor(new Type[] { typeof(string) }),
-                constructorArgs: new object[] { clsid }));
+                constructorArgs: new object[] { _clsid }));
 
             tb.SetCustomAttribute(new CustomAttributeBuilder(
                 con: typeof(ComVisibleAttribute).GetConstructor(new Type[] { typeof(bool) }),
@@ -269,6 +269,27 @@ private static Type CreateActivatorType(string aumid)
             return tb.CreateType();
         }
 
+        private static string GetAumidFromPackageManifest()
+        {
+            var appxManifestPath = Path.Combine(Package.Current.InstalledLocation.Path, "AppxManifest.xml");
+            var doc = new System.Xml.XmlDocument();
+            doc.Load(appxManifestPath);
+
+            var namespaceManager = new System.Xml.XmlNamespaceManager(doc.NameTable);
+            namespaceManager.AddNamespace("default", "http://schemas.microsoft.com/appx/manifest/foundation/windows10");
+            namespaceManager.AddNamespace("desktop", "http://schemas.microsoft.com/appx/manifest/desktop/windows10");
+            namespaceManager.AddNamespace("com", "http://schemas.microsoft.com/appx/manifest/com/windows10");
+
+            var appNode = doc.SelectSingleNode("/default:Package/default:Applications/default:Application[1]", namespaceManager);
+
+            if (appNode == null)
+            {
+                throw new InvalidOperationException("Your MSIX app manifest must have an <Application> entry.");
+            }
+
+            return Package.Current.Id.FamilyName + "!" + appNode.Attributes["Id"].Value;
+        }
+
         private static string GetClsidFromPackageManifest()
         {
             var appxManifestPath = Path.Combine(Package.Current.InstalledLocation.Path, "AppxManifest.xml");
@@ -355,7 +376,7 @@ private static string GenerateGuid(string name)
 
         private static Type CreateAndRegisterActivator()
         {
-            var activatorType = CreateActivatorType(_aumid);
+            var activatorType = CreateActivatorType();
             RegisterActivator(activatorType);
             _registeredOnActivated = true;
             return activatorType;
@@ -363,7 +384,7 @@ private static Type CreateAndRegisterActivator()
 
         private static void RegisterActivator(Type activatorType)
         {
-            if (!DesktopBridgeHelpers.IsRunningAsUwp())
+            if (!DesktopBridgeHelpers.IsContainerized())
             {
                 string exePath = Process.GetCurrentProcess().MainModule.FileName;
                 RegisterComServer(activatorType, exePath);
@@ -468,15 +489,13 @@ private static extern int CoRegisterClassObject(
         public static ToastNotifier CreateToastNotifier()
         {
 #if WIN32
-            if (_win32Aumid != null)
+            if (DesktopBridgeHelpers.HasIdentity())
             {
-                // Non-Desktop Bridge
-                return ToastNotificationManager.CreateToastNotifier(_win32Aumid);
+                return ToastNotificationManager.CreateToastNotifier();
             }
             else
             {
-                // Desktop Bridge
-                return ToastNotificationManager.CreateToastNotifier();
+                return ToastNotificationManager.CreateToastNotifier(_win32Aumid);
             }
 #else
             return ToastNotificationManager.CreateToastNotifier();
@@ -491,7 +510,7 @@ public static ToastNotificationHistoryCompat History
             get
             {
 #if WIN32
-                return new ToastNotificationHistoryCompat(_win32Aumid);
+                return new ToastNotificationHistoryCompat(DesktopBridgeHelpers.HasIdentity() ? null : _win32Aumid);
 #else
                 return new ToastNotificationHistoryCompat(null);
 #endif
@@ -506,7 +525,7 @@ public static bool CanUseHttpImages
             get
             {
 #if WIN32
-                return DesktopBridgeHelpers.IsRunningAsUwp();
+                return DesktopBridgeHelpers.HasIdentity();
 #else
                 return true;
 #endif
@@ -519,35 +538,50 @@ public static bool CanUseHttpImages
         /// </summary>
         public static void Uninstall()
         {
-            if (DesktopBridgeHelpers.IsRunningAsUwp())
+            if (DesktopBridgeHelpers.IsContainerized())
             {
-                // Packaged apps automatically clean everything up already
+                // Packaged containerized apps automatically clean everything up already
                 return;
             }
 
-            try
+            if (!DesktopBridgeHelpers.HasIdentity())
             {
-                // Remove all scheduled notifications (do this first before clearing current notifications)
-                var notifier = CreateToastNotifier();
-                foreach (var scheduled in CreateToastNotifier().GetScheduledToastNotifications())
+                try
                 {
-                    try
-                    {
-                        notifier.RemoveFromSchedule(scheduled);
-                    }
-                    catch
+                    // Remove all scheduled notifications (do this first before clearing current notifications)
+                    var notifier = CreateToastNotifier();
+                    foreach (var scheduled in CreateToastNotifier().GetScheduledToastNotifications())
                     {
+                        try
+                        {
+                            notifier.RemoveFromSchedule(scheduled);
+                        }
+                        catch
+                        {
+                        }
                     }
                 }
-            }
-            catch
-            {
+                catch
+                {
+                }
+
+                try
+                {
+                    // Clear all current notifications
+                    History.Clear();
+                }
+                catch
+                {
+                }
             }
 
             try
             {
-                // Clear all current notifications
-                History.Clear();
+                // Remove registry key
+                if (_win32Aumid != null)
+                {
+                    Registry.CurrentUser.DeleteSubKey(@"Software\Classes\AppUserModelId\" + _win32Aumid);
+                }
             }
             catch
             {
@@ -555,24 +589,29 @@ public static void Uninstall()
 
             try
             {
-                // Remove registry key
-                Registry.CurrentUser.DeleteSubKey(@"Software\Classes\AppUserModelId\" + _aumid);
+                if (_clsid != null)
+                {
+                    Registry.CurrentUser.DeleteSubKey(string.Format("SOFTWARE\\Classes\\CLSID\\{{{0}}}\\LocalServer32", _clsid));
+                }
             }
             catch
             {
             }
 
-            try
+            if (!DesktopBridgeHelpers.HasIdentity())
             {
-                // Delete any of the app files
-                var appDataFolderPath = GetAppDataFolderPath();
-                if (Directory.Exists(appDataFolderPath))
+                try
+                {
+                    // Delete any of the app files
+                    var appDataFolderPath = GetAppDataFolderPath();
+                    if (Directory.Exists(appDataFolderPath))
+                    {
+                        Directory.Delete(appDataFolderPath, recursive: true);
+                    }
+                }
+                catch
                 {
-                    Directory.Delete(appDataFolderPath, recursive: true);
                 }
-            }
-            catch
-            {
             }
         }
 #endif

From 3c3759204566cd65fdae1045eee7da5635e102b0 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 3 Sep 2020 09:39:54 -0700
Subject: [PATCH 25/46] Simplified Show and Schedule methods

And a few improvements to Builder (default to foreground for activation info and allow adding silent toast audio)
---
 .../Toasts/Builder/ToastContentBuilder.cs     | 51 +++++++++++++++++--
 .../MainWindow.xaml.cs                        |  9 +---
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
index 213591ae0a7..91daf649407 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
@@ -63,7 +61,7 @@ public ToastContentBuilder AddHeader(string id, string title, string arguments)
         /// <param name="launchArgs">Custom app-defined launch arguments to be passed along on toast activation</param>
         /// <param name="activationType">Set the activation type that will be used when the user click on this toast</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-        public ToastContentBuilder AddToastActivationInfo(string launchArgs, ToastActivationType activationType)
+        public ToastContentBuilder AddToastActivationInfo(string launchArgs, ToastActivationType activationType = ToastActivationType.Foreground)
         {
             Content.Launch = launchArgs;
             Content.ActivationType = activationType;
@@ -123,6 +121,17 @@ public ToastContentBuilder AddAudio(Uri src, bool? loop = null, bool? silent = n
             return this;
         }
 
+        /// <summary>
+        /// Set custom audio to go along with the toast.
+        /// </summary>
+        /// <param name="audio">The <see cref="ToastAudio"/> to set.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddAudio(ToastAudio audio)
+        {
+            Content.Audio = audio;
+            return this;
+        }
+
         /// <summary>
         /// Get the instance of <see cref="ToastContent"/> that has been built by the builder with specified configuration so far.
         /// </summary>
@@ -131,6 +140,42 @@ public ToastContent GetToastContent()
         {
             return Content;
         }
+
+#if WINDOWS_UWP
+        /// <summary>
+        /// Retrieves the notification XML content as a WinRT XmlDocument, so that it can be used with a local Toast notification's constructor on either <see cref="Windows.UI.Notifications.ToastNotification"/> or <see cref="Windows.UI.Notifications.ScheduledToastNotification"/>.
+        /// </summary>
+        /// <returns>The notification XML content as a WinRT XmlDocument.</returns>
+        public Windows.Data.Xml.Dom.XmlDocument GetXml()
+        {
+            return GetToastContent().GetXml();
+        }
+
+        /// <summary>
+        /// Shows a new toast notification with the current content.
+        /// </summary>
+        /// <param name="customize">Allows you to set additional properties on the <see cref="Windows.UI.Notifications.ToastNotification"/> object.</param>
+        public void Show(Action<Windows.UI.Notifications.ToastNotification> customize = null)
+        {
+            var notif = new Windows.UI.Notifications.ToastNotification(GetToastContent().GetXml());
+            customize?.Invoke(notif);
+
+            ToastNotificationManagerCompat.CreateToastNotifier().Show(notif);
+        }
+
+        /// <summary>
+        /// Schedules the notification.
+        /// </summary>
+        /// <param name="deliveryTime">The date and time that Windows should display the toast notification. This time must be in the future.</param>
+        /// <param name="customize">Allows you to set additional properties on the <see cref="Windows.UI.Notifications.ScheduledToastNotification"/> object.</param>
+        public void Schedule(DateTimeOffset deliveryTime, Action<Windows.UI.Notifications.ScheduledToastNotification> customize = null)
+        {
+            var notif = new Windows.UI.Notifications.ScheduledToastNotification(GetToastContent().GetXml(), deliveryTime);
+            customize?.Invoke(notif);
+
+            ToastNotificationManagerCompat.CreateToastNotifier().AddToSchedule(notif);
+        }
+#endif
     }
 
 #endif
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
index 49fbe369382..638545e7d89 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
@@ -4,7 +4,6 @@
 
 using System.Windows;
 using Microsoft.Toolkit.Uwp.Notifications;
-using Windows.UI.Notifications;
 
 namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
 {
@@ -20,13 +19,9 @@ public MainWindow()
 
         private void ButtonShowToast_Click(object sender, RoutedEventArgs e)
         {
-            var content = new ToastContentBuilder()
+            new ToastContentBuilder()
                 .AddText("Hello from WPF!")
-                .GetToastContent();
-
-            var notif = new ToastNotification(content.GetXml());
-
-            ToastNotificationManagerCompat.CreateToastNotifier().Show(notif);
+                .Show();
         }
     }
 }

From 9f084ff0f1feed65504b29934944207c9fb575fb Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 3 Sep 2020 10:10:57 -0700
Subject: [PATCH 26/46] Add tests for new builder

---
 .../TestToastContentBuilder.cs                | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs b/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
index 83a28ef286c..663b8203401 100644
--- a/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
+++ b/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
@@ -64,6 +64,22 @@ public void AddToastActivationInfoTest_WithExpectedArgs_ReturnSelfWithActivation
             Assert.AreEqual(testToastActivationType, builder.Content.ActivationType);
         }
 
+        [TestMethod]
+        public void AddToastActivationInfoDefaultTest_WithExpectedArgs_ReturnSelfWithActivationInfoAdded()
+        {
+            // Arrange
+            string testToastLaunchArugments = "Test Toast Launch Args";
+
+            // Act
+            ToastContentBuilder builder = new ToastContentBuilder();
+            ToastContentBuilder anotherReference = builder.AddToastActivationInfo(testToastLaunchArugments);
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+            Assert.AreEqual(testToastLaunchArugments, builder.Content.Launch);
+            Assert.AreEqual(ToastActivationType.Foreground, builder.Content.ActivationType);
+        }
+
         [TestMethod]
         public void SetToastDurationTest_WithCustomToastDuration_ReturnSelfWithCustomToastDurationSet()
         {
@@ -128,6 +144,24 @@ public void AddAudioTest_WithFullArgs_ReturnSelfWithCustomAudioAddedWithAllOptio
             Assert.AreEqual(testToastAudioSilent, builder.Content.Audio.Silent);
         }
 
+        [TestMethod]
+        public void AddAudioTest_WithAudioObject_ReturnSelfWithCustomAudioAdded()
+        {
+            // Arrange
+            var audio = new ToastAudio()
+            {
+                Silent = true
+            };
+
+            // Act
+            ToastContentBuilder builder = new ToastContentBuilder();
+            ToastContentBuilder anotherReference = builder.AddAudio(audio);
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+            Assert.AreSame(audio, builder.Content.Audio);
+        }
+
         [TestMethod]
         public void AddAttributionTextTest_WithSimpleText_ReturnSelfWithCustomAttributionTextAdded()
         {

From 0cc87d1343db152d0eac61dda85e103d9880d47c Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 3 Sep 2020 10:51:26 -0700
Subject: [PATCH 27/46] Update sample app samples

---
 .../TestBackgroundTask.cs                     | 26 +-------
 .../SamplePages/Toast/ToastCode.bind          | 17 ++---
 .../Toast/ToastCodeJavaScript.bind            |  2 +-
 .../WeatherLiveTileAndToastCode.bind          | 63 +++++++++----------
 4 files changed, 38 insertions(+), 70 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BackgroundTaskHelper/TestBackgroundTask.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BackgroundTaskHelper/TestBackgroundTask.cs
index 6cc55e2b72e..ed2822e90de 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BackgroundTaskHelper/TestBackgroundTask.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/BackgroundTaskHelper/TestBackgroundTask.cs
@@ -4,7 +4,6 @@
 
 using Microsoft.Toolkit.Uwp.Notifications;
 using Windows.ApplicationModel.Background;
-using Windows.UI.Notifications;
 
 namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages
 {
@@ -12,28 +11,9 @@ internal class TestBackgroundTask : IBackgroundTask
     {
         public void Run(IBackgroundTaskInstance taskInstance)
         {
-            // Create content of the toast notification
-            var toastContent = new ToastContent()
-            {
-                Scenario = ToastScenario.Default,
-                Visual = new ToastVisual
-                {
-                    BindingGeneric = new ToastBindingGeneric
-                    {
-                        Children =
-                        {
-                            new AdaptiveText
-                            {
-                                Text = "New toast notification (BackgroundTaskHelper)."
-                            }
-                        }
-                    }
-                }
-            };
-
-            // Create & show toast notification
-            var toastNotification = new ToastNotification(toastContent.GetXml());
-            ToastNotificationManagerCompat.CreateToastNotifier().Show(toastNotification);
+            new ToastContentBuilder()
+                .AddText("New toast notification (BackgroundTaskHelper).")
+                .Show();
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
index 507d65ba2a0..d4d037c1de6 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
@@ -1,14 +1,8 @@
 private void PopToast()
 {
     // Generate the toast notification content and pop the toast
-    ToastContent content = GenerateToastContent();
-    ToastNotificationManagerCompat.CreateToastNotifier().Show(new ToastNotification(content.GetXml()));
-}
-
-public static ToastContent GenerateToastContent()
-{        
-    var builder = new ToastContentBuilder().SetToastScenario(ToastScenario.Reminder)        
-        .AddToastActivationInfo("action=viewEvent&eventId=1983", ToastActivationType.Foreground)        
+    new ToastContentBuilder().SetToastScenario(ToastScenario.Reminder)        
+        .AddToastActivationInfo("action=viewEvent&eventId=1983")        
         .AddText("Adaptive Tiles Meeting")        
         .AddText("Conf Room 2001 / Building 135")        
         .AddText("10:00 AM - 10:30 AM")        
@@ -18,7 +12,6 @@ public static ToastContent GenerateToastContent()
                                          ("240", "4 hours"),        
                                          ("1440", "1 day"))        
         .AddButton(new ToastButtonSnooze() { SelectionBoxId = "snoozeTime" })        
-        .AddButton(new ToastButtonDismiss());        
-
-    return builder.Content;        
-}        
\ No newline at end of file
+        .AddButton(new ToastButtonDismiss());
+        .Show();
+}
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCodeJavaScript.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCodeJavaScript.bind
index 764fd1b6a24..00958686dd2 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCodeJavaScript.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCodeJavaScript.bind
@@ -49,5 +49,5 @@ var popToast = function () {
     // generate the toast notification content and pop the toast
     var content = generateToastContent();
     var toast = new Windows.UI.Notifications.ToastNotification(content.getXml());
-    Windows.UI.Notifications.ToastNotificationManagerCompat.createToastNotifier().show(toast);
+    Windows.UI.Notifications.ToastNotificationManager.createToastNotifier().show(toast);
 };
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
index 36a0f22209b..f3f2a2212cd 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
@@ -1,40 +1,10 @@
 private void PopToast()
 {
-    // Generate the toast notification content and pop the toast
-    ToastContent content = GenerateToastContent();
-    ToastNotificationManagerCompat.CreateToastNotifier().Show(new ToastNotification(content.GetXml()));
-}
-
-private async void PinTile()
-{
-    SecondaryTile tile = new SecondaryTile(DateTime.Now.Ticks.ToString())
-    {
-        DisplayName = "WeatherSample",
-        Arguments = "args"
-    };
-    tile.VisualElements.ShowNameOnSquare150x150Logo = true;
-    tile.VisualElements.ShowNameOnSquare310x310Logo = true;
-    tile.VisualElements.ShowNameOnWide310x150Logo = true;
-    tile.VisualElements.Square150x150Logo = Constants.Square150x150Logo;
-    tile.VisualElements.Wide310x150Logo = Constants.Wide310x150Logo;
-    tile.VisualElements.Square310x310Logo = Constants.Square310x310Logo;
-
-    if (!await tile.RequestCreateAsync())
-    {
-        return;
-    }
-    
-    // Generate the tile notification content and update the tile
-    TileContent content = GenerateTileContent();
-    TileUpdateManager.CreateTileUpdaterForSecondaryTile(tile.TileId).Update(new TileNotification(content.GetXml()));
-}
-
-public static ToastContent GenerateToastContent()
-{        
+    // Generate the toast notification content
     ToastContentBuilder builder = new ToastContentBuilder();        
 
     // Include launch string so we know what to open when user clicks toast        
-    builder.AddToastActivationInfo("action=viewForecast&zip=98008", ToastActivationType.Foreground);        
+    builder.AddToastActivationInfo("action=viewForecast&zip=98008");        
 
     // We'll always have this summary text on our toast notification        
     // (it is required that your toast starts with a text element)        
@@ -68,8 +38,33 @@ public static ToastContent GenerateToastContent()
     // Set the base URI for the images, so we don't redundantly specify the entire path        
     builder.Content.Visual.BaseUri = new Uri("Assets/NotificationAssets/", UriKind.Relative);        
 
-    return builder.Content;        
-}        
+    // Show the toast
+    builder.Show();
+}
+
+private async void PinTile()
+{
+    SecondaryTile tile = new SecondaryTile(DateTime.Now.Ticks.ToString())
+    {
+        DisplayName = "WeatherSample",
+        Arguments = "args"
+    };
+    tile.VisualElements.ShowNameOnSquare150x150Logo = true;
+    tile.VisualElements.ShowNameOnSquare310x310Logo = true;
+    tile.VisualElements.ShowNameOnWide310x150Logo = true;
+    tile.VisualElements.Square150x150Logo = Constants.Square150x150Logo;
+    tile.VisualElements.Wide310x150Logo = Constants.Wide310x150Logo;
+    tile.VisualElements.Square310x310Logo = Constants.Square310x310Logo;
+
+    if (!await tile.RequestCreateAsync())
+    {
+        return;
+    }
+    
+    // Generate the tile notification content and update the tile
+    TileContent content = GenerateTileContent();
+    TileUpdateManager.CreateTileUpdaterForSecondaryTile(tile.TileId).Update(new TileNotification(content.GetXml()));
+}
 
 public static TileContent GenerateTileContent()
 {        

From c87a37160d4f0e256236534341ebbf7ad713adf5 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 3 Sep 2020 12:42:50 -0700
Subject: [PATCH 28/46] Fix ToastCode.bind

---
 .../SamplePages/Toast/ToastCode.bind                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
index d4d037c1de6..30c2793d052 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
@@ -12,6 +12,6 @@ private void PopToast()
                                          ("240", "4 hours"),        
                                          ("1440", "1 day"))        
         .AddButton(new ToastButtonSnooze() { SelectionBoxId = "snoozeTime" })        
-        .AddButton(new ToastButtonDismiss());
+        .AddButton(new ToastButtonDismiss())
         .Show();
 }
\ No newline at end of file

From 28e7730929ecfbe6459c0c06753138cc80f7e7bd Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 2 Oct 2020 14:05:27 -0700
Subject: [PATCH 29/46] Use shortcut

---
 .../Toasts/Compat/Desktop/CAppResolver.cs     |  20 ++
 .../Compat/Desktop/IApplicationResolver.cs    |  80 ++++++++
 .../Toasts/Compat/Desktop/IShellItem.cs       |  41 ++++
 .../Compat/Desktop/IShellItemImageFactory.cs  |  24 +++
 .../Toasts/Compat/Desktop/SIIGBF.cs           |  24 +++
 .../Toasts/Compat/Desktop/SIZE.cs             |  25 +++
 .../Compat/ToastNotificationManagerCompat.cs  | 177 +++++++++++++++---
 .../App.xaml.cs                               |   2 +-
 8 files changed, 369 insertions(+), 24 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/CAppResolver.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IApplicationResolver.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IShellItem.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IShellItemImageFactory.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/SIIGBF.cs
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/SIZE.cs

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/CAppResolver.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/CAppResolver.cs
new file mode 100644
index 00000000000..0752d77f4fa
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/CAppResolver.cs
@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if WIN32
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    [ComImport]
+    [Guid("660b90c8-73a9-4b58-8cae-355b7f55341b")]
+    [ClassInterface(ClassInterfaceType.None)]
+    internal class CAppResolver
+    {
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IApplicationResolver.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IApplicationResolver.cs
new file mode 100644
index 00000000000..436f47dc18c
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IApplicationResolver.cs
@@ -0,0 +1,80 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if WIN32
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    [ComImport]
+    [Guid("DE25675A-72DE-44b4-9373-05170450C140")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    internal interface IApplicationResolver
+    {
+        void GetAppIDForShortcut(
+            IntPtr psi,
+            [Out, MarshalAs(UnmanagedType.LPWStr)] out string ppszAppID);
+
+        void GetAppIDForShortcutObject(
+            IntPtr psl,
+            IntPtr psi,
+            [Out, MarshalAs(UnmanagedType.LPWStr)] out string ppszAppID);
+
+        void GetAppIDForWindow(
+            int hwnd,
+            [Out, MarshalAs(UnmanagedType.LPWStr)] out string ppszAppID,
+            [Out] out bool pfPinningPrevented,
+            [Out] out bool pfExplicitAppID,
+            [Out] out bool pfEmbeddedShortcutValid);
+
+        /// <summary>
+        /// Main way to obtain app ID for any process. Calls GetShortcutPathOrAppIdFromPid
+        /// </summary>
+        void GetAppIDForProcess(
+            uint dwProcessID,
+            [Out, MarshalAs(UnmanagedType.LPWStr)] out string ppszAppID,
+            [Out] out bool pfPinningPrevented,
+            [Out] out bool pfExplicitAppID,
+            [Out] out bool pfEmbeddedShortcutValid);
+
+        void GetShortcutForProcess(
+            uint dwProcessID,
+            [Out] out IntPtr ppsi);
+
+        void GetBestShortcutForAppID(
+            string pszAppID,
+            [Out] out IShellItem ppsi);
+
+        void GetBestShortcutAndAppIDForAppPath(
+            string pszAppPath,
+            [Out] out IntPtr ppsi,
+            [Out, MarshalAs(UnmanagedType.LPWStr)] out string ppszAppID);
+
+        void CanPinApp(IntPtr psi);
+
+        void CanPinAppShortcut(
+            IntPtr psl,
+            IntPtr psi);
+
+        void GetRelaunchProperties(
+            int hwnd,
+            [Out, MarshalAs(UnmanagedType.LPWStr)] out string ppszAppID,
+            [Out, MarshalAs(UnmanagedType.LPWStr)] out string ppszCmdLine,
+            [Out, MarshalAs(UnmanagedType.LPWStr)] out string ppszIconResource,
+            [Out, MarshalAs(UnmanagedType.LPWStr)] out string ppszDisplayNameResource,
+            [Out] bool pfPinnable);
+
+        void GenerateShortcutFromWindowProperties(
+            int hwnd,
+            [Out] out IntPtr ppsi);
+
+        void GenerateShortcutFromItemProperties(
+            IntPtr psi2,
+            [Out] out IntPtr ppsi);
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IShellItem.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IShellItem.cs
new file mode 100644
index 00000000000..25db4a5faa0
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IShellItem.cs
@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if WIN32
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    [ComImport]
+    [Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    internal interface IShellItem
+    {
+        void BindToHandler(
+            IntPtr pbc,
+            IntPtr bhid,
+            IntPtr riid,
+            [Out] out IntPtr ppv);
+
+        void GetParent(
+            [Out] out IShellItem ppsi);
+
+        void GetDisplayName(
+            int sigdnName,
+            [Out, MarshalAs(UnmanagedType.LPWStr)] out string ppszName);
+
+        void GetAttributes(
+            int sfgaoMask,
+            [Out] out int psfgaoAttribs);
+
+        void Compare(
+            IShellItem psi,
+            int hint,
+            [Out] out int piOrder);
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IShellItemImageFactory.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IShellItemImageFactory.cs
new file mode 100644
index 00000000000..91630eeae4b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IShellItemImageFactory.cs
@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if WIN32
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    [ComImport]
+    [Guid("bcc18b79-ba16-442f-80c4-8a59c30c463b")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    internal interface IShellItemImageFactory
+    {
+        void GetImage(
+            [In, MarshalAs(UnmanagedType.Struct)] SIZE size,
+            [In] SIIGBF flags,
+            [Out] out IntPtr phbm);
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/SIIGBF.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/SIIGBF.cs
new file mode 100644
index 00000000000..ca2fcb3aa0c
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/SIIGBF.cs
@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if WIN32
+
+using System;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    [Flags]
+    internal enum SIIGBF
+    {
+        ResizeToFit = 0x00,
+        BiggerSizeOk = 0x01,
+        MemoryOnly = 0x02,
+        IconOnly = 0x04,
+        ThumbnailOnly = 0x08,
+        InCacheOnly = 0x10,
+        ScaleUp = 0x00000100
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/SIZE.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/SIZE.cs
new file mode 100644
index 00000000000..d66af5743eb
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/SIZE.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if WIN32
+
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct SIZE
+    {
+        internal int X;
+        internal int Y;
+
+        internal SIZE(int x, int y)
+        {
+            this.X = x;
+            this.Y = y;
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
index b37cdb21d38..56f187aa5f6 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -136,11 +136,71 @@ private static void Initialize()
                 // If they don't have identity, we need to specify the display assets
                 if (!DesktopBridgeHelpers.HasIdentity())
                 {
-                    // Win32 app display names come from their process name
-                    string displayName = GetDisplayNameFromCurrentProcess(currProcess);
+                    IShellItem shortcutItem = null;
+                    try
+                    {
+                        IApplicationResolver appResolver = (IApplicationResolver)new CAppResolver();
+                        appResolver.GetBestShortcutForAppID(_win32Aumid, out shortcutItem);
+                    }
+                    catch
+                    {
+                    }
+
+                    string displayName = null;
+                    string iconPath = null;
+
+                    // First we attempt to use display assets from the shortcut itself
+                    if (shortcutItem != null)
+                    {
+                        try
+                        {
+                            shortcutItem.GetDisplayName(0, out displayName);
+
+                            ((IShellItemImageFactory)shortcutItem).GetImage(new SIZE(48, 48), SIIGBF.IconOnly | SIIGBF.BiggerSizeOk, out IntPtr nativeHBitmap);
+
+                            if (nativeHBitmap != IntPtr.Zero)
+                            {
+                                try
+                                {
+                                    System.Drawing.Bitmap bmp = System.Drawing.Bitmap.FromHbitmap(nativeHBitmap);
+
+                                    if (IsAlphaBitmap(bmp, out var bmpData))
+                                    {
+                                        var alphaBitmap = GetAlphaBitmapFromBitmapData(bmpData);
+                                        iconPath = SaveIconToAppPath(alphaBitmap);
+                                    }
+                                    else
+                                    {
+                                        iconPath = SaveIconToAppPath(bmp);
+                                    }
+                                }
+                                catch
+                                {
+                                }
+
+                                DeleteObject(nativeHBitmap);
+                            }
+                        }
+                        catch
+                        {
+                        }
+                    }
 
-                    string iconPath = GetIconPathFromCurrentProcess(currProcess);
+                    // If we didn't get a display name from shortcut
+                    if (string.IsNullOrWhiteSpace(displayName))
+                    {
+                        // We use the one from the process
+                        displayName = GetDisplayNameFromCurrentProcess(currProcess);
+                    }
 
+                    // If we didn't get an icon from shortcut
+                    if (string.IsNullOrWhiteSpace(iconPath))
+                    {
+                        // We use the one from the process
+                        iconPath = ExtractAndObtainIconFromCurrentProcess(currProcess);
+                    }
+
+                    // Set the display name and icon uri
                     rootKey.SetValue("DisplayName", displayName);
 
                     if (iconPath != null)
@@ -149,7 +209,10 @@ private static void Initialize()
                     }
                     else
                     {
-                        rootKey.DeleteValue("IconUri");
+                        if (rootKey.GetValue("IconUri") != null)
+                        {
+                            rootKey.DeleteValue("IconUri");
+                        }
                     }
 
                     // Background color only appears in the settings page, format is
@@ -161,22 +224,71 @@ private static void Initialize()
             }
         }
 
-        private static string GetAumidFromCurrentProcess(Process process)
+        // From https://stackoverflow.com/a/9291151
+        private static System.Drawing.Bitmap GetAlphaBitmapFromBitmapData(System.Drawing.Imaging.BitmapData bmpData)
         {
-            // TODO: Should actually do the following which is what Shell does...
-            // 1) check for a matching shortcut in a few designated folders; if there is a shortcut, check if the app developer specified an explicit app ID on it (there is also a bunch of logic to dedupe these shortcuts across different folders). 2) if there is no matching shortcut or if no expliit app id was provided on the shortcut that was found, appresolver generates an ID for the item.
-            // This generated app ID is either 1) the path to the exe if there are no launch arguments or 2) a GUID if there are launch arguments
-            // the GUID is a hash of the exe path, launch args, and maybe display name (i'd have to double check)
+            return new System.Drawing.Bitmap(
+                    bmpData.Width,
+                    bmpData.Height,
+                    bmpData.Stride,
+                    System.Drawing.Imaging.PixelFormat.Format32bppArgb,
+                    bmpData.Scan0);
+        }
 
-            // Temporarily we'll just use a hash of the file name
-            return GenerateGuid(process.MainModule.FileName);
+        // From https://stackoverflow.com/a/9291151
+        private static bool IsAlphaBitmap(System.Drawing.Bitmap bmp, out System.Drawing.Imaging.BitmapData bmpData)
+        {
+            var bmBounds = new System.Drawing.Rectangle(0, 0, bmp.Width, bmp.Height);
+
+            bmpData = bmp.LockBits(bmBounds, System.Drawing.Imaging.ImageLockMode.ReadOnly, bmp.PixelFormat);
+
+            try
+            {
+                for (int y = 0; y <= bmpData.Height - 1; y++)
+                {
+                    for (int x = 0; x <= bmpData.Width - 1; x++)
+                    {
+                        var pixelColor = System.Drawing.Color.FromArgb(
+                            Marshal.ReadInt32(bmpData.Scan0, (bmpData.Stride * y) + (4 * x)));
+
+                        if (pixelColor.A > 0 & pixelColor.A < 255)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                bmp.UnlockBits(bmpData);
+            }
+
+            return false;
         }
 
-        private static string GetDisplayNameFromCurrentProcess(Process process)
+        /// <summary>Deletes a logical pen, brush, font, bitmap, region, or palette, freeing all system resources associated with the object. After the object is deleted, the specified handle is no longer valid.</summary>
+        /// <param name="hObject">A handle to a logical pen, brush, font, bitmap, region, or palette.</param>
+        /// <returns>
+        ///   <para>If the function succeeds, the return value is nonzero.</para>
+        ///   <para>If the specified handle is not valid or is currently selected into a DC, the return value is zero.</para>
+        /// </returns>
+        /// <remarks>
+        ///   <para>Do not delete a drawing object (pen or brush) while it is still selected into a DC.</para>
+        ///   <para>When a pattern brush is deleted, the bitmap associated with the brush is not deleted. The bitmap must be deleted independently.</para>
+        /// </remarks>
+        [DllImport("gdi32.dll", EntryPoint = "DeleteObject")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool DeleteObject([In] IntPtr hObject);
+
+        private static string GetAumidFromCurrentProcess(Process process)
         {
-            // TODO: Should actually do the following which is what Shell does...
-            // They look for the AppResolver shortcut first and use that, otherwise they pull it from the EXE
+            IApplicationResolver appResolver = (IApplicationResolver)new CAppResolver();
+            appResolver.GetAppIDForProcess(Convert.ToUInt32(process.Id), out string appId, out bool pinningPrevented, out bool explicitAppId, out bool embeddedShortcutValid);
+            return appId;
+        }
 
+        private static string GetDisplayNameFromCurrentProcess(Process process)
+        {
             // If AssemblyTitle is set, use that
             var assemblyTitleAttr = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyTitleAttribute>();
             if (assemblyTitleAttr != null)
@@ -188,22 +300,39 @@ private static string GetDisplayNameFromCurrentProcess(Process process)
             return process.ProcessName;
         }
 
-        private static string GetIconPathFromCurrentProcess(Process process)
+        private static string ExtractAndObtainIconFromCurrentProcess(Process process)
+        {
+            return ExtractAndObtainIconFromPath(process.MainModule.FileName);
+        }
+
+        private static string ExtractAndObtainIconFromPath(string pathToExtract)
         {
             try
             {
-                var path = Path.Combine(GetAppDataFolderPath(), "Icon.png");
-
-                // Ensure the directories exist
-                Directory.CreateDirectory(Path.GetDirectoryName(path));
-
                 // Extract the icon
-                var icon = System.Drawing.Icon.ExtractAssociatedIcon(process.MainModule.FileName);
+                var icon = System.Drawing.Icon.ExtractAssociatedIcon(pathToExtract);
 
                 using (var bmp = icon.ToBitmap())
                 {
-                    bmp.Save(path, System.Drawing.Imaging.ImageFormat.Png);
+                    return SaveIconToAppPath(bmp);
                 }
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        private static string SaveIconToAppPath(System.Drawing.Bitmap bitmap)
+        {
+            try
+            {
+                var path = Path.Combine(GetAppDataFolderPath(), "Icon.png");
+
+                // Ensure the directories exist
+                Directory.CreateDirectory(Path.GetDirectoryName(path));
+
+                bitmap.Save(path, System.Drawing.Imaging.ImageFormat.Png);
 
                 return path;
             }
@@ -219,7 +348,9 @@ private static string GetIconPathFromCurrentProcess(Process process)
         /// <returns>Returns a string of the absolute folder path.</returns>
         private static string GetAppDataFolderPath()
         {
-            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "ToastNotificationManagerCompat", "Apps", _win32Aumid);
+            string conciseAumid = _win32Aumid.Contains('\\') ? GenerateGuid(_win32Aumid) : _win32Aumid;
+
+            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "ToastNotificationManagerCompat", "Apps", conciseAumid);
         }
 
         private static Type CreateActivatorType()
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
index 2d0eb0118de..c4f34406064 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
@@ -53,7 +53,7 @@ private void OpenWindowIfNeeded()
         protected override void OnExit(ExitEventArgs e)
         {
             // If your app has an installer, you should call this when your app is uninstalled. Otherwise, if your app is a "portable app" and you no longer need notifications while the app is closed, you can call this upon exit.
-            ToastNotificationManagerCompat.Uninstall();
+            //ToastNotificationManagerCompat.Uninstall();
         }
     }
 }

From 5a8d9b346820fc75cf2e3a9fc0653647c4257253 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 2 Oct 2020 14:22:25 -0700
Subject: [PATCH 30/46] Refactoring to Win32AppInfo

---
 .../Desktop/{ => Native}/CAppResolver.cs      |   0
 .../{ => Native}/IApplicationResolver.cs      |   0
 .../Compat/Desktop/{ => Native}/IShellItem.cs |   0
 .../{ => Native}/IShellItemImageFactory.cs    |   0
 .../Compat/Desktop/{ => Native}/SIIGBF.cs     |   0
 .../Compat/Desktop/{ => Native}/SIZE.cs       |   0
 .../Toasts/Compat/Desktop/Win32AppInfo.cs     | 254 ++++++++++++++++++
 .../Compat/ToastNotificationManagerCompat.cs  | 248 +----------------
 8 files changed, 264 insertions(+), 238 deletions(-)
 rename Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/{ => Native}/CAppResolver.cs (100%)
 rename Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/{ => Native}/IApplicationResolver.cs (100%)
 rename Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/{ => Native}/IShellItem.cs (100%)
 rename Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/{ => Native}/IShellItemImageFactory.cs (100%)
 rename Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/{ => Native}/SIIGBF.cs (100%)
 rename Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/{ => Native}/SIZE.cs (100%)
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Win32AppInfo.cs

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/CAppResolver.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Native/CAppResolver.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/CAppResolver.cs
rename to Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Native/CAppResolver.cs
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IApplicationResolver.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Native/IApplicationResolver.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IApplicationResolver.cs
rename to Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Native/IApplicationResolver.cs
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IShellItem.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Native/IShellItem.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IShellItem.cs
rename to Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Native/IShellItem.cs
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IShellItemImageFactory.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Native/IShellItemImageFactory.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/IShellItemImageFactory.cs
rename to Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Native/IShellItemImageFactory.cs
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/SIIGBF.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Native/SIIGBF.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/SIIGBF.cs
rename to Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Native/SIIGBF.cs
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/SIZE.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Native/SIZE.cs
similarity index 100%
rename from Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/SIZE.cs
rename to Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Native/SIZE.cs
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Win32AppInfo.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Win32AppInfo.cs
new file mode 100644
index 00000000000..6dce097f717
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/Win32AppInfo.cs
@@ -0,0 +1,254 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if WIN32
+
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    internal class Win32AppInfo
+    {
+        public string Aumid { get; set; }
+
+        public string DisplayName { get; set; }
+
+        public string IconPath { get; set; }
+
+        public static Win32AppInfo Get()
+        {
+            var process = Process.GetCurrentProcess();
+
+            // First get the app ID
+            IApplicationResolver appResolver = (IApplicationResolver)new CAppResolver();
+            appResolver.GetAppIDForProcess(Convert.ToUInt32(process.Id), out string appId, out _, out _, out _);
+
+            // Then try to get the shortcut (for display name and icon)
+            IShellItem shortcutItem = null;
+            try
+            {
+                appResolver.GetBestShortcutForAppID(appId, out shortcutItem);
+            }
+            catch
+            {
+            }
+
+            string displayName = null;
+            string iconPath = null;
+
+            // First we attempt to use display assets from the shortcut itself
+            if (shortcutItem != null)
+            {
+                try
+                {
+                    shortcutItem.GetDisplayName(0, out displayName);
+
+                    ((IShellItemImageFactory)shortcutItem).GetImage(new SIZE(48, 48), SIIGBF.IconOnly | SIIGBF.BiggerSizeOk, out IntPtr nativeHBitmap);
+
+                    if (nativeHBitmap != IntPtr.Zero)
+                    {
+                        try
+                        {
+                            Bitmap bmp = Bitmap.FromHbitmap(nativeHBitmap);
+
+                            if (IsAlphaBitmap(bmp, out var bmpData))
+                            {
+                                var alphaBitmap = GetAlphaBitmapFromBitmapData(bmpData);
+                                iconPath = SaveIconToAppPath(alphaBitmap, appId);
+                            }
+                            else
+                            {
+                                iconPath = SaveIconToAppPath(bmp, appId);
+                            }
+                        }
+                        catch
+                        {
+                        }
+
+                        DeleteObject(nativeHBitmap);
+                    }
+                }
+                catch
+                {
+                }
+            }
+
+            // If we didn't get a display name from shortcut
+            if (string.IsNullOrWhiteSpace(displayName))
+            {
+                // We use the one from the process
+                displayName = GetDisplayNameFromCurrentProcess(process);
+            }
+
+            // If we didn't get an icon from shortcut
+            if (string.IsNullOrWhiteSpace(iconPath))
+            {
+                // We use the one from the process
+                iconPath = ExtractAndObtainIconFromCurrentProcess(process, appId);
+            }
+
+            return new Win32AppInfo()
+            {
+                Aumid = appId,
+                DisplayName = displayName,
+                IconPath = iconPath
+            };
+        }
+
+        private static string GetDisplayNameFromCurrentProcess(Process process)
+        {
+            // If AssemblyTitle is set, use that
+            var assemblyTitleAttr = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyTitleAttribute>();
+            if (assemblyTitleAttr != null)
+            {
+                return assemblyTitleAttr.Title;
+            }
+
+            // Otherwise, fall back to process name
+            return process.ProcessName;
+        }
+
+        private static string ExtractAndObtainIconFromCurrentProcess(Process process, string appId)
+        {
+            return ExtractAndObtainIconFromPath(process.MainModule.FileName, appId);
+        }
+
+        private static string ExtractAndObtainIconFromPath(string pathToExtract, string appId)
+        {
+            try
+            {
+                // Extract the icon
+                var icon = Icon.ExtractAssociatedIcon(pathToExtract);
+
+                using (var bmp = icon.ToBitmap())
+                {
+                    return SaveIconToAppPath(bmp, appId);
+                }
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        private static string SaveIconToAppPath(Bitmap bitmap, string appId)
+        {
+            try
+            {
+                var path = Path.Combine(GetAppDataFolderPath(appId), "Icon.png");
+
+                // Ensure the directories exist
+                Directory.CreateDirectory(Path.GetDirectoryName(path));
+
+                bitmap.Save(path, ImageFormat.Png);
+
+                return path;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the app data folder path within the ToastNotificationManagerCompat folder, used for storing icon assets and any additional data.
+        /// </summary>
+        /// <returns>Returns a string of the absolute folder path.</returns>
+        public static string GetAppDataFolderPath(string appId)
+        {
+            string conciseAumid = appId.Contains("\\") ? GenerateGuid(appId) : appId;
+
+            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "ToastNotificationManagerCompat", "Apps", conciseAumid);
+        }
+
+        // From https://stackoverflow.com/a/9291151
+        private static Bitmap GetAlphaBitmapFromBitmapData(BitmapData bmpData)
+        {
+            return new Bitmap(
+                    bmpData.Width,
+                    bmpData.Height,
+                    bmpData.Stride,
+                    PixelFormat.Format32bppArgb,
+                    bmpData.Scan0);
+        }
+
+        // From https://stackoverflow.com/a/9291151
+        private static bool IsAlphaBitmap(Bitmap bmp, out BitmapData bmpData)
+        {
+            var bmBounds = new Rectangle(0, 0, bmp.Width, bmp.Height);
+
+            bmpData = bmp.LockBits(bmBounds, ImageLockMode.ReadOnly, bmp.PixelFormat);
+
+            try
+            {
+                for (int y = 0; y <= bmpData.Height - 1; y++)
+                {
+                    for (int x = 0; x <= bmpData.Width - 1; x++)
+                    {
+                        var pixelColor = Color.FromArgb(
+                            Marshal.ReadInt32(bmpData.Scan0, (bmpData.Stride * y) + (4 * x)));
+
+                        if (pixelColor.A > 0 & pixelColor.A < 255)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                bmp.UnlockBits(bmpData);
+            }
+
+            return false;
+        }
+
+        [DllImport("gdi32.dll", EntryPoint = "DeleteObject")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool DeleteObject([In] IntPtr hObject);
+
+        /// <summary>
+        /// From https://stackoverflow.com/a/41622689/1454643
+        /// Generates Guid based on String. Key assumption for this algorithm is that name is unique (across where it it's being used)
+        /// and if name byte length is less than 16 - it will be fetched directly into guid, if over 16 bytes - then we compute sha-1
+        /// hash from string and then pass it to guid.
+        /// </summary>
+        /// <param name="name">Unique name which is unique across where this guid will be used.</param>
+        /// <returns>For example "706C7567-696E-7300-0000-000000000000" for "plugins"</returns>
+        public static string GenerateGuid(string name)
+        {
+            byte[] buf = Encoding.UTF8.GetBytes(name);
+            byte[] guid = new byte[16];
+            if (buf.Length < 16)
+            {
+                Array.Copy(buf, guid, buf.Length);
+            }
+            else
+            {
+                using (SHA1 sha1 = SHA1.Create())
+                {
+                    byte[] hash = sha1.ComputeHash(buf);
+
+                    // Hash is 20 bytes, but we need 16. We loose some of "uniqueness", but I doubt it will be fatal
+                    Array.Copy(hash, guid, 16);
+                }
+            }
+
+            // Don't use Guid constructor, it tends to swap bytes. We want to preserve original string as hex dump.
+            string guidS = $"{guid[0]:X2}{guid[1]:X2}{guid[2]:X2}{guid[3]:X2}-{guid[4]:X2}{guid[5]:X2}-{guid[6]:X2}{guid[7]:X2}-{guid[8]:X2}{guid[9]:X2}-{guid[10]:X2}{guid[11]:X2}{guid[12]:X2}{guid[13]:X2}{guid[14]:X2}{guid[15]:X2}";
+
+            return guidS;
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
index 56f187aa5f6..f9510e9d057 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -12,8 +12,6 @@
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Runtime.InteropServices;
-using System.Security.Cryptography;
-using System.Text;
 using Microsoft.Win32;
 using Windows.ApplicationModel;
 using Windows.Foundation.Collections;
@@ -114,6 +112,8 @@ private static void Initialize()
                 return;
             }
 
+            Win32AppInfo win32AppInfo = null;
+
             // If sparse
             if (DesktopBridgeHelpers.HasIdentity())
             {
@@ -121,91 +121,25 @@ private static void Initialize()
             }
             else
             {
-                // Win32 apps are uniquely identified based on their process name
-                _win32Aumid = GetAumidFromCurrentProcess(Process.GetCurrentProcess());
+                win32AppInfo = Win32AppInfo.Get();
+                _win32Aumid = win32AppInfo.Aumid;
             }
 
             // Create and register activator
             var activatorType = CreateAndRegisterActivator();
 
             // Register via registry
-            var currProcess = Process.GetCurrentProcess();
-
             using (var rootKey = Registry.CurrentUser.CreateSubKey(@"Software\Classes\AppUserModelId\" + _win32Aumid))
             {
                 // If they don't have identity, we need to specify the display assets
                 if (!DesktopBridgeHelpers.HasIdentity())
                 {
-                    IShellItem shortcutItem = null;
-                    try
-                    {
-                        IApplicationResolver appResolver = (IApplicationResolver)new CAppResolver();
-                        appResolver.GetBestShortcutForAppID(_win32Aumid, out shortcutItem);
-                    }
-                    catch
-                    {
-                    }
-
-                    string displayName = null;
-                    string iconPath = null;
-
-                    // First we attempt to use display assets from the shortcut itself
-                    if (shortcutItem != null)
-                    {
-                        try
-                        {
-                            shortcutItem.GetDisplayName(0, out displayName);
-
-                            ((IShellItemImageFactory)shortcutItem).GetImage(new SIZE(48, 48), SIIGBF.IconOnly | SIIGBF.BiggerSizeOk, out IntPtr nativeHBitmap);
-
-                            if (nativeHBitmap != IntPtr.Zero)
-                            {
-                                try
-                                {
-                                    System.Drawing.Bitmap bmp = System.Drawing.Bitmap.FromHbitmap(nativeHBitmap);
-
-                                    if (IsAlphaBitmap(bmp, out var bmpData))
-                                    {
-                                        var alphaBitmap = GetAlphaBitmapFromBitmapData(bmpData);
-                                        iconPath = SaveIconToAppPath(alphaBitmap);
-                                    }
-                                    else
-                                    {
-                                        iconPath = SaveIconToAppPath(bmp);
-                                    }
-                                }
-                                catch
-                                {
-                                }
-
-                                DeleteObject(nativeHBitmap);
-                            }
-                        }
-                        catch
-                        {
-                        }
-                    }
-
-                    // If we didn't get a display name from shortcut
-                    if (string.IsNullOrWhiteSpace(displayName))
-                    {
-                        // We use the one from the process
-                        displayName = GetDisplayNameFromCurrentProcess(currProcess);
-                    }
-
-                    // If we didn't get an icon from shortcut
-                    if (string.IsNullOrWhiteSpace(iconPath))
-                    {
-                        // We use the one from the process
-                        iconPath = ExtractAndObtainIconFromCurrentProcess(currProcess);
-                    }
-
                     // Set the display name and icon uri
-                    rootKey.SetValue("DisplayName", displayName);
+                    rootKey.SetValue("DisplayName", win32AppInfo.DisplayName);
 
-                    if (iconPath != null)
+                    if (win32AppInfo.IconPath != null)
                     {
-                        rootKey.SetValue("IconUri", iconPath);
+                        rootKey.SetValue("IconUri", win32AppInfo.IconPath);
                     }
                     else
                     {
@@ -224,135 +158,6 @@ private static void Initialize()
             }
         }
 
-        // From https://stackoverflow.com/a/9291151
-        private static System.Drawing.Bitmap GetAlphaBitmapFromBitmapData(System.Drawing.Imaging.BitmapData bmpData)
-        {
-            return new System.Drawing.Bitmap(
-                    bmpData.Width,
-                    bmpData.Height,
-                    bmpData.Stride,
-                    System.Drawing.Imaging.PixelFormat.Format32bppArgb,
-                    bmpData.Scan0);
-        }
-
-        // From https://stackoverflow.com/a/9291151
-        private static bool IsAlphaBitmap(System.Drawing.Bitmap bmp, out System.Drawing.Imaging.BitmapData bmpData)
-        {
-            var bmBounds = new System.Drawing.Rectangle(0, 0, bmp.Width, bmp.Height);
-
-            bmpData = bmp.LockBits(bmBounds, System.Drawing.Imaging.ImageLockMode.ReadOnly, bmp.PixelFormat);
-
-            try
-            {
-                for (int y = 0; y <= bmpData.Height - 1; y++)
-                {
-                    for (int x = 0; x <= bmpData.Width - 1; x++)
-                    {
-                        var pixelColor = System.Drawing.Color.FromArgb(
-                            Marshal.ReadInt32(bmpData.Scan0, (bmpData.Stride * y) + (4 * x)));
-
-                        if (pixelColor.A > 0 & pixelColor.A < 255)
-                        {
-                            return true;
-                        }
-                    }
-                }
-            }
-            finally
-            {
-                bmp.UnlockBits(bmpData);
-            }
-
-            return false;
-        }
-
-        /// <summary>Deletes a logical pen, brush, font, bitmap, region, or palette, freeing all system resources associated with the object. After the object is deleted, the specified handle is no longer valid.</summary>
-        /// <param name="hObject">A handle to a logical pen, brush, font, bitmap, region, or palette.</param>
-        /// <returns>
-        ///   <para>If the function succeeds, the return value is nonzero.</para>
-        ///   <para>If the specified handle is not valid or is currently selected into a DC, the return value is zero.</para>
-        /// </returns>
-        /// <remarks>
-        ///   <para>Do not delete a drawing object (pen or brush) while it is still selected into a DC.</para>
-        ///   <para>When a pattern brush is deleted, the bitmap associated with the brush is not deleted. The bitmap must be deleted independently.</para>
-        /// </remarks>
-        [DllImport("gdi32.dll", EntryPoint = "DeleteObject")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool DeleteObject([In] IntPtr hObject);
-
-        private static string GetAumidFromCurrentProcess(Process process)
-        {
-            IApplicationResolver appResolver = (IApplicationResolver)new CAppResolver();
-            appResolver.GetAppIDForProcess(Convert.ToUInt32(process.Id), out string appId, out bool pinningPrevented, out bool explicitAppId, out bool embeddedShortcutValid);
-            return appId;
-        }
-
-        private static string GetDisplayNameFromCurrentProcess(Process process)
-        {
-            // If AssemblyTitle is set, use that
-            var assemblyTitleAttr = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyTitleAttribute>();
-            if (assemblyTitleAttr != null)
-            {
-                return assemblyTitleAttr.Title;
-            }
-
-            // Otherwise, fall back to process name
-            return process.ProcessName;
-        }
-
-        private static string ExtractAndObtainIconFromCurrentProcess(Process process)
-        {
-            return ExtractAndObtainIconFromPath(process.MainModule.FileName);
-        }
-
-        private static string ExtractAndObtainIconFromPath(string pathToExtract)
-        {
-            try
-            {
-                // Extract the icon
-                var icon = System.Drawing.Icon.ExtractAssociatedIcon(pathToExtract);
-
-                using (var bmp = icon.ToBitmap())
-                {
-                    return SaveIconToAppPath(bmp);
-                }
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        private static string SaveIconToAppPath(System.Drawing.Bitmap bitmap)
-        {
-            try
-            {
-                var path = Path.Combine(GetAppDataFolderPath(), "Icon.png");
-
-                // Ensure the directories exist
-                Directory.CreateDirectory(Path.GetDirectoryName(path));
-
-                bitmap.Save(path, System.Drawing.Imaging.ImageFormat.Png);
-
-                return path;
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets the app data folder path within the ToastNotificationManagerCompat folder, used for storing icon assets and any additional data.
-        /// </summary>
-        /// <returns>Returns a string of the absolute folder path.</returns>
-        private static string GetAppDataFolderPath()
-        {
-            string conciseAumid = _win32Aumid.Contains('\\') ? GenerateGuid(_win32Aumid) : _win32Aumid;
-
-            return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "ToastNotificationManagerCompat", "Apps", conciseAumid);
-        }
-
         private static Type CreateActivatorType()
         {
             // https://stackoverflow.com/questions/24069352/c-sharp-typebuilder-generate-class-with-function-dynamically
@@ -376,7 +181,7 @@ private static Type CreateActivatorType()
             }
             else
             {
-                _clsid = GenerateGuid(_win32Aumid);
+                _clsid = Win32AppInfo.GenerateGuid(_win32Aumid);
             }
 
             tb.SetCustomAttribute(new CustomAttributeBuilder(
@@ -472,39 +277,6 @@ private static string GetClsidFromPackageManifest()
             return clsid;
         }
 
-        /// <summary>
-        /// From https://stackoverflow.com/a/41622689/1454643
-        /// Generates Guid based on String. Key assumption for this algorithm is that name is unique (across where it it's being used)
-        /// and if name byte length is less than 16 - it will be fetched directly into guid, if over 16 bytes - then we compute sha-1
-        /// hash from string and then pass it to guid.
-        /// </summary>
-        /// <param name="name">Unique name which is unique across where this guid will be used.</param>
-        /// <returns>For example "706C7567-696E-7300-0000-000000000000" for "plugins"</returns>
-        private static string GenerateGuid(string name)
-        {
-            byte[] buf = Encoding.UTF8.GetBytes(name);
-            byte[] guid = new byte[16];
-            if (buf.Length < 16)
-            {
-                Array.Copy(buf, guid, buf.Length);
-            }
-            else
-            {
-                using (SHA1 sha1 = SHA1.Create())
-                {
-                    byte[] hash = sha1.ComputeHash(buf);
-
-                    // Hash is 20 bytes, but we need 16. We loose some of "uniqueness", but I doubt it will be fatal
-                    Array.Copy(hash, guid, 16);
-                }
-            }
-
-            // Don't use Guid constructor, it tends to swap bytes. We want to preserve original string as hex dump.
-            string guidS = $"{guid[0]:X2}{guid[1]:X2}{guid[2]:X2}{guid[3]:X2}-{guid[4]:X2}{guid[5]:X2}-{guid[6]:X2}{guid[7]:X2}-{guid[8]:X2}{guid[9]:X2}-{guid[10]:X2}{guid[11]:X2}{guid[12]:X2}{guid[13]:X2}{guid[14]:X2}{guid[15]:X2}";
-
-            return guidS;
-        }
-
         private static Type CreateAndRegisterActivator()
         {
             var activatorType = CreateActivatorType();
@@ -729,12 +501,12 @@ public static void Uninstall()
             {
             }
 
-            if (!DesktopBridgeHelpers.HasIdentity())
+            if (!DesktopBridgeHelpers.HasIdentity() && _win32Aumid != null)
             {
                 try
                 {
                     // Delete any of the app files
-                    var appDataFolderPath = GetAppDataFolderPath();
+                    var appDataFolderPath = Win32AppInfo.GetAppDataFolderPath(_win32Aumid);
                     if (Directory.Exists(appDataFolderPath))
                     {
                         Directory.Delete(appDataFolderPath, recursive: true);

From 04a7e71b601eb0684e29e824ff6c2b97eb226a55 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 2 Oct 2020 15:01:56 -0700
Subject: [PATCH 31/46] Refactor into ManifestHelper

---
 .../Toasts/Compat/Desktop/ManifestHelper.cs   | 91 +++++++++++++++++++
 .../Compat/ToastNotificationManagerCompat.cs  | 76 +---------------
 2 files changed, 93 insertions(+), 74 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/ManifestHelper.cs

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/ManifestHelper.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/ManifestHelper.cs
new file mode 100644
index 00000000000..214b248548e
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/Desktop/ManifestHelper.cs
@@ -0,0 +1,91 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if WIN32
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Xml;
+using Windows.ApplicationModel;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    internal class ManifestHelper
+    {
+        private XmlDocument _doc;
+        private XmlNamespaceManager _namespaceManager;
+
+        public ManifestHelper()
+        {
+            var appxManifestPath = Path.Combine(Package.Current.InstalledLocation.Path, "AppxManifest.xml");
+            var doc = new XmlDocument();
+            doc.Load(appxManifestPath);
+
+            var namespaceManager = new XmlNamespaceManager(doc.NameTable);
+            namespaceManager.AddNamespace("default", "http://schemas.microsoft.com/appx/manifest/foundation/windows10");
+            namespaceManager.AddNamespace("desktop", "http://schemas.microsoft.com/appx/manifest/desktop/windows10");
+            namespaceManager.AddNamespace("com", "http://schemas.microsoft.com/appx/manifest/com/windows10");
+
+            _doc = doc;
+            _namespaceManager = namespaceManager;
+        }
+
+        internal string GetAumidFromPackageManifest()
+        {
+            var appNode = _doc.SelectSingleNode("/default:Package/default:Applications/default:Application[1]", _namespaceManager);
+
+            if (appNode == null)
+            {
+                throw new InvalidOperationException("Your MSIX app manifest must have an <Application> entry.");
+            }
+
+            return Package.Current.Id.FamilyName + "!" + appNode.Attributes["Id"].Value;
+        }
+
+        internal string GetClsidFromPackageManifest()
+        {
+            var activatorClsidNode = _doc.SelectSingleNode("/default:Package/default:Applications/default:Application[1]/default:Extensions/desktop:Extension[@Category='windows.toastNotificationActivation']/desktop:ToastNotificationActivation/@ToastActivatorCLSID", _namespaceManager);
+
+            if (activatorClsidNode == null)
+            {
+                throw new InvalidOperationException("Your app manifest must have a toastNotificationActivation extension with a valid ToastActivatorCLSID specified.");
+            }
+
+            var clsid = activatorClsidNode.Value;
+
+            // Make sure they have a COM class registration matching the CLSID
+            var comClassNode = _doc.SelectSingleNode($"/default:Package/default:Applications/default:Application[1]/default:Extensions/com:Extension[@Category='windows.comServer']/com:ComServer/com:ExeServer/com:Class[@Id='{clsid}']", _namespaceManager);
+
+            if (comClassNode == null)
+            {
+                throw new InvalidOperationException("Your app manifest must have a comServer extension with a class ID matching your toastNotificationActivator's CLSID.");
+            }
+
+            // Make sure they have a COM class registration matching their current process executable
+            var comExeServerNode = comClassNode.ParentNode;
+
+            var specifiedExeRelativePath = comExeServerNode.Attributes["Executable"].Value;
+            var specifiedExeFullPath = Path.Combine(Package.Current.InstalledLocation.Path, specifiedExeRelativePath);
+            var actualExeFullPath = Process.GetCurrentProcess().MainModule.FileName;
+
+            if (specifiedExeFullPath != actualExeFullPath)
+            {
+                var correctExeRelativePath = actualExeFullPath.Substring(Package.Current.InstalledLocation.Path.Length + 1);
+                throw new InvalidOperationException($"Your app manifest's comServer extension's Executable value is incorrect. It should be \"{correctExeRelativePath}\".");
+            }
+
+            // Make sure their arguments are set correctly
+            var argumentsNode = comExeServerNode.Attributes.GetNamedItem("Arguments");
+            if (argumentsNode == null || argumentsNode.Value != "-ToastActivated")
+            {
+                throw new InvalidOperationException("Your app manifest's comServer extension for toast activation must have its Arguments set exactly to \"-ToastActivated\"");
+            }
+
+            return clsid;
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
index f9510e9d057..b11ab196573 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -117,7 +117,7 @@ private static void Initialize()
             // If sparse
             if (DesktopBridgeHelpers.HasIdentity())
             {
-                _win32Aumid = GetAumidFromPackageManifest();
+                _win32Aumid = new ManifestHelper().GetAumidFromPackageManifest();
             }
             else
             {
@@ -177,7 +177,7 @@ private static Type CreateActivatorType()
 
             if (DesktopBridgeHelpers.IsContainerized())
             {
-                _clsid = GetClsidFromPackageManifest();
+                _clsid = new ManifestHelper().GetClsidFromPackageManifest();
             }
             else
             {
@@ -205,78 +205,6 @@ private static Type CreateActivatorType()
             return tb.CreateType();
         }
 
-        private static string GetAumidFromPackageManifest()
-        {
-            var appxManifestPath = Path.Combine(Package.Current.InstalledLocation.Path, "AppxManifest.xml");
-            var doc = new System.Xml.XmlDocument();
-            doc.Load(appxManifestPath);
-
-            var namespaceManager = new System.Xml.XmlNamespaceManager(doc.NameTable);
-            namespaceManager.AddNamespace("default", "http://schemas.microsoft.com/appx/manifest/foundation/windows10");
-            namespaceManager.AddNamespace("desktop", "http://schemas.microsoft.com/appx/manifest/desktop/windows10");
-            namespaceManager.AddNamespace("com", "http://schemas.microsoft.com/appx/manifest/com/windows10");
-
-            var appNode = doc.SelectSingleNode("/default:Package/default:Applications/default:Application[1]", namespaceManager);
-
-            if (appNode == null)
-            {
-                throw new InvalidOperationException("Your MSIX app manifest must have an <Application> entry.");
-            }
-
-            return Package.Current.Id.FamilyName + "!" + appNode.Attributes["Id"].Value;
-        }
-
-        private static string GetClsidFromPackageManifest()
-        {
-            var appxManifestPath = Path.Combine(Package.Current.InstalledLocation.Path, "AppxManifest.xml");
-            var doc = new System.Xml.XmlDocument();
-            doc.Load(appxManifestPath);
-
-            var namespaceManager = new System.Xml.XmlNamespaceManager(doc.NameTable);
-            namespaceManager.AddNamespace("default", "http://schemas.microsoft.com/appx/manifest/foundation/windows10");
-            namespaceManager.AddNamespace("desktop", "http://schemas.microsoft.com/appx/manifest/desktop/windows10");
-            namespaceManager.AddNamespace("com", "http://schemas.microsoft.com/appx/manifest/com/windows10");
-
-            var activatorClsidNode = doc.SelectSingleNode("/default:Package/default:Applications/default:Application[1]/default:Extensions/desktop:Extension[@Category='windows.toastNotificationActivation']/desktop:ToastNotificationActivation/@ToastActivatorCLSID", namespaceManager);
-
-            if (activatorClsidNode == null)
-            {
-                throw new InvalidOperationException("Your app manifest must have a toastNotificationActivation extension with a valid ToastActivatorCLSID specified.");
-            }
-
-            var clsid = activatorClsidNode.Value;
-
-            // Make sure they have a COM class registration matching the CLSID
-            var comClassNode = doc.SelectSingleNode($"/default:Package/default:Applications/default:Application[1]/default:Extensions/com:Extension[@Category='windows.comServer']/com:ComServer/com:ExeServer/com:Class[@Id='{clsid}']", namespaceManager);
-
-            if (comClassNode == null)
-            {
-                throw new InvalidOperationException("Your app manifest must have a comServer extension with a class ID matching your toastNotificationActivator's CLSID.");
-            }
-
-            // Make sure they have a COM class registration matching their current process executable
-            var comExeServerNode = comClassNode.ParentNode;
-
-            var specifiedExeRelativePath = comExeServerNode.Attributes["Executable"].Value;
-            var specifiedExeFullPath = Path.Combine(Package.Current.InstalledLocation.Path, specifiedExeRelativePath);
-            var actualExeFullPath = Process.GetCurrentProcess().MainModule.FileName;
-
-            if (specifiedExeFullPath != actualExeFullPath)
-            {
-                var correctExeRelativePath = actualExeFullPath.Substring(Package.Current.InstalledLocation.Path.Length + 1);
-                throw new InvalidOperationException($"Your app manifest's comServer extension's Executable value is incorrect. It should be \"{correctExeRelativePath}\".");
-            }
-
-            // Make sure their arguments are set correctly
-            var argumentsNode = comExeServerNode.Attributes.GetNamedItem("Arguments");
-            if (argumentsNode == null || argumentsNode.Value != "-ToastActivated")
-            {
-                throw new InvalidOperationException("Your app manifest's comServer extension for toast activation must have its Arguments set exactly to \"-ToastActivated\"");
-            }
-
-            return clsid;
-        }
-
         private static Type CreateAndRegisterActivator()
         {
             var activatorType = CreateActivatorType();

From e8cd6f0abd5b9149a144213051de4edd07922437 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 9 Oct 2020 10:46:09 -0700
Subject: [PATCH 32/46] ToastContentBuilder support for C++ UWP apps

---
 .../Adaptive/AdaptiveProgressBarValue.cs      |  23 ++
 .../Toasts/Builder/CustomizeToast.cs          |  39 +++
 .../Builder/ToastContentBuilder.Actions.cs    |  91 +++++-
 .../Builder/ToastContentBuilder.Visuals.cs    | 290 ++++++++++++++----
 .../Toasts/Builder/ToastContentBuilder.cs     | 134 +++++++-
 .../TestToastContentBuilder.cs                |  10 +-
 6 files changed, 499 insertions(+), 88 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/CustomizeToast.cs

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveProgressBarValue.cs b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveProgressBarValue.cs
index a0daade80a6..7436f0261ab 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveProgressBarValue.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Adaptive/AdaptiveProgressBarValue.cs
@@ -11,6 +11,11 @@ namespace Microsoft.Toolkit.Uwp.Notifications
     /// </summary>
     public sealed class AdaptiveProgressBarValue
     {
+        /// <summary>
+        /// Gets or sets the property name to bind to.
+        /// </summary>
+        public string BindingName { get; set; }
+
         /// <summary>
         /// Gets or sets the value (0-1) representing the percent complete.
         /// </summary>
@@ -35,6 +40,11 @@ internal string ToXmlString()
                 return "indeterminate";
             }
 
+            if (BindingName != null)
+            {
+                return "{" + BindingName + "}";
+            }
+
             return Value.ToString();
         }
 
@@ -69,5 +79,18 @@ public static AdaptiveProgressBarValue FromValue(double d)
                 Value = d
             };
         }
+
+        /// <summary>
+        /// Returns a progress bar value using the specified binding name.
+        /// </summary>
+        /// <param name="bindingName">The property to bind to.</param>
+        /// <returns>A progress bar value.</returns>
+        public static AdaptiveProgressBarValue FromBinding(string bindingName)
+        {
+            return new AdaptiveProgressBarValue()
+            {
+                BindingName = bindingName
+            };
+        }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/CustomizeToast.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/CustomizeToast.cs
new file mode 100644
index 00000000000..43ce87c53f1
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/CustomizeToast.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if WINDOWS_UWP
+
+using Windows.Foundation;
+using Windows.UI.Notifications;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    /// <summary>
+    /// Allows you to set additional properties on the <see cref="ToastNotification"/> object before the toast is displayed.
+    /// </summary>
+    /// <param name="toast">The toast to modify that will be displayed.</param>
+    public delegate void CustomizeToast(ToastNotification toast);
+
+    /// <summary>
+    /// Allows you to set additional properties on the <see cref="ToastNotification"/> object before the toast is displayed.
+    /// </summary>
+    /// <param name="toast">The toast to modify that will be displayed.</param>
+    /// <returns>An operation.</returns>
+    public delegate IAsyncAction CustomizeToastAsync(ToastNotification toast);
+
+    /// <summary>
+    /// Allows you to set additional properties on the <see cref="ScheduledToastNotification"/> object before the toast is scheduled.
+    /// </summary>
+    /// <param name="toast">The scheduled toast to modify that will be scheduled.</param>
+    public delegate void CustomizeScheduledToast(ScheduledToastNotification toast);
+
+    /// <summary>
+    /// Allows you to set additional properties on the <see cref="ScheduledToastNotification"/> object before the toast is scheduled.
+    /// </summary>
+    /// <param name="toast">The scheduled toast to modify that will be scheduled.</param>
+    /// <returns>An operation.</returns>
+    public delegate IAsyncAction CustomizeScheduledToastAsync(ScheduledToastNotification toast);
+}
+
+#endif
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs
index 031861ccbec..49a6da09198 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs
@@ -8,13 +8,16 @@
 
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
-#if !WINRT
 #pragma warning disable SA1008
 #pragma warning disable SA1009
     /// <summary>
     /// Builder class used to create <see cref="ToastContent"/>
     /// </summary>
-    public partial class ToastContentBuilder
+    public
+#if WINRT
+        sealed
+#endif
+        partial class ToastContentBuilder
     {
         private IToastActions Actions
         {
@@ -45,6 +48,18 @@ private IList<IToastInput> InputList
             }
         }
 
+        /// <summary>
+        /// Add a button to the current toast.
+        /// </summary>
+        /// <param name="content">Text to display on the button.</param>
+        /// <param name="activationType">Type of activation this button will use when clicked. Defaults to Foreground.</param>
+        /// <param name="arguments">App-defined string of arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddButton(string content, ToastActivationType activationType, string arguments)
+        {
+            return AddButton(content, activationType, arguments, default);
+        }
+
         /// <summary>
         /// Add a button to the current toast.
         /// </summary>
@@ -53,7 +68,10 @@ private IList<IToastInput> InputList
         /// <param name="arguments">App-defined string of arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
         /// <param name="imageUri">Optional image icon for the button to display (required for buttons adjacent to inputs like quick reply).</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-        public ToastContentBuilder AddButton(string content, ToastActivationType activationType, string arguments, Uri imageUri = default(Uri))
+#if WINRT
+        [Windows.Foundation.Metadata.DefaultOverload]
+#endif
+        public ToastContentBuilder AddButton(string content, ToastActivationType activationType, string arguments, Uri imageUri)
         {
             // Add new button
             ToastButton button = new ToastButton(content, arguments)
@@ -61,7 +79,7 @@ private IList<IToastInput> InputList
                 ActivationType = activationType
             };
 
-            if (imageUri != default(Uri))
+            if (imageUri != default)
             {
                 button.ImageUri = imageUri.OriginalString;
             }
@@ -87,6 +105,19 @@ public ToastContentBuilder AddButton(IToastButton button)
             return this;
         }
 
+        /// <summary>
+        /// Add an button to the toast that will be display to the right of the input text box, achieving a quick reply scenario.
+        /// </summary>
+        /// <param name="textBoxId">ID of an existing <see cref="ToastTextBox"/> in order to have this button display to the right of the input, achieving a quick reply scenario.</param>
+        /// <param name="content">Text to display on the button.</param>
+        /// <param name="activationType">Type of activation this button will use when clicked. Defaults to Foreground.</param>
+        /// <param name="arguments">App-defined string of arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddButton(string textBoxId, string content, ToastActivationType activationType, string arguments)
+        {
+            return AddButton(textBoxId, content, activationType, arguments, default);
+        }
+
         /// <summary>
         /// Add an button to the toast that will be display to the right of the input text box, achieving a quick reply scenario.
         /// </summary>
@@ -96,7 +127,7 @@ public ToastContentBuilder AddButton(IToastButton button)
         /// <param name="arguments">App-defined string of arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
         /// <param name="imageUri">An optional image icon for the button to display (required for buttons adjacent to inputs like quick reply)</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-        public ToastContentBuilder AddButton(string textBoxId, string content, ToastActivationType activationType, string arguments, Uri imageUri = default(Uri))
+        public ToastContentBuilder AddButton(string textBoxId, string content, ToastActivationType activationType, string arguments, Uri imageUri)
         {
             // Add new button
             ToastButton button = new ToastButton(content, arguments)
@@ -105,7 +136,7 @@ public ToastContentBuilder AddButton(IToastButton button)
                 TextBoxId = textBoxId
             };
 
-            if (imageUri != default(Uri))
+            if (imageUri != default)
             {
                 button.ImageUri = imageUri.OriginalString;
             }
@@ -113,6 +144,29 @@ public ToastContentBuilder AddButton(IToastButton button)
             return AddButton(button);
         }
 
+#if WINRT
+        /// <summary>
+        /// Add an input text box that the user can type into.
+        /// </summary>
+        /// <param name="id">Required ID property so that developers can retrieve user input once the app is activated.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddInputTextBox(string id)
+        {
+            return AddInputTextBox(id, default, default);
+        }
+
+        /// <summary>
+        /// Add an input text box that the user can type into.
+        /// </summary>
+        /// <param name="id">Required ID property so that developers can retrieve user input once the app is activated.</param>
+        /// <param name="placeHolderContent">Placeholder text to be displayed on the text box when the user hasn't typed any text yet.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddInputTextBox(string id, string placeHolderContent)
+        {
+            return AddInputTextBox(id, placeHolderContent, default);
+        }
+#endif
+
         /// <summary>
         /// Add an input text box that the user can type into.
         /// </summary>
@@ -120,16 +174,24 @@ public ToastContentBuilder AddButton(IToastButton button)
         /// <param name="placeHolderContent">Placeholder text to be displayed on the text box when the user hasn't typed any text yet.</param>
         /// <param name="title">Title text to display above the text box.</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-        public ToastContentBuilder AddInputTextBox(string id, string placeHolderContent = default(string), string title = default(string))
+        public ToastContentBuilder AddInputTextBox(
+            string id,
+#if WINRT
+            string placeHolderContent,
+            string title)
+#else
+            string placeHolderContent = default,
+            string title = default)
+#endif
         {
             var inputTextBox = new ToastTextBox(id);
 
-            if (placeHolderContent != default(string))
+            if (placeHolderContent != default)
             {
                 inputTextBox.PlaceholderContent = placeHolderContent;
             }
 
-            if (title != default(string))
+            if (title != default)
             {
                 inputTextBox.Title = title;
             }
@@ -137,6 +199,7 @@ public ToastContentBuilder AddButton(IToastButton button)
             return AddToastInput(inputTextBox);
         }
 
+#if !WINRT
         /// <summary>
         /// Add a combo box / drop-down menu that contain options for user to select.
         /// </summary>
@@ -145,7 +208,7 @@ public ToastContentBuilder AddButton(IToastButton button)
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
         public ToastContentBuilder AddComboBox(string id, params (string comboBoxItemId, string comboBoxItemContent)[] choices)
         {
-            return AddComboBox(id, default(string), choices);
+            return AddComboBox(id, default, choices);
         }
 
         /// <summary>
@@ -157,7 +220,7 @@ public ToastContentBuilder AddComboBox(string id, params (string comboBoxItemId,
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
         public ToastContentBuilder AddComboBox(string id, string defaultSelectionBoxItemId, params (string comboBoxItemId, string comboBoxItemContent)[] choices)
         {
-            return AddComboBox(id, default(string), defaultSelectionBoxItemId, choices);
+            return AddComboBox(id, default, defaultSelectionBoxItemId, choices);
         }
 
         /// <summary>
@@ -185,12 +248,12 @@ public ToastContentBuilder AddComboBox(string id, string title, string defaultSe
         {
             var box = new ToastSelectionBox(id);
 
-            if (defaultSelectionBoxItemId != default(string))
+            if (defaultSelectionBoxItemId != default)
             {
                 box.DefaultSelectionBoxItemId = defaultSelectionBoxItemId;
             }
 
-            if (title != default(string))
+            if (title != default)
             {
                 box.Title = title;
             }
@@ -203,6 +266,7 @@ public ToastContentBuilder AddComboBox(string id, string title, string defaultSe
 
             return AddToastInput(box);
         }
+#endif
 
         /// <summary>
         /// Add an input option to the Toast.
@@ -218,5 +282,4 @@ public ToastContentBuilder AddToastInput(IToastInput input)
     }
 #pragma warning restore SA1008
 #pragma warning restore SA1009
-#endif
 }
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Visuals.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Visuals.cs
index 0de3804d214..715c5f46d08 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Visuals.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Visuals.cs
@@ -13,7 +13,6 @@
 
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
-#if !WINRT
     /// <summary>
     /// Builder class used to create <see cref="ToastContent"/>
     /// </summary>
@@ -81,7 +80,7 @@ private IList<IToastBindingGenericChild> VisualChildren
         }
 
 #if WINDOWS_UWP
-
+#if !WINRT
         /// <summary>
         /// Create an instance of NotificationData that can be used to update toast that has a progress bar.
         /// </summary>
@@ -93,7 +92,7 @@ private IList<IToastBindingGenericChild> VisualChildren
         /// <param name="status"> A status string, which is displayed underneath the progress bar on the left. Default to empty.</param>
         /// <param name="sequence">A sequence number to prevent out-of-order updates, or assign 0 to indicate "always update".</param>
         /// <returns>An instance of NotificationData that can be used to update the toast.</returns>
-        public static NotificationData CreateProgressBarData(ToastContent toast, int index = 0, string title = default(string), double? value = null, string valueStringOverride = default(string), string status = default(string), uint sequence = 0)
+        public static NotificationData CreateProgressBarData(ToastContent toast, int index = 0, string title = default, double? value = default, string valueStringOverride = default, string status = default, uint sequence = 0)
         {
             var progressBar = toast.Visual.BindingGeneric.Children.Where(c => c is AdaptiveProgressBar).ElementAt(index) as AdaptiveProgressBar;
             if (progressBar == null)
@@ -104,45 +103,56 @@ private IList<IToastBindingGenericChild> VisualChildren
             NotificationData data = new NotificationData();
             data.SequenceNumber = sequence;
 
-            if (progressBar.Title is BindableString bindableTitle && title != default(string))
+            // Native C++ doesn't support BindableString
+            if (progressBar.Title is BindableString bindableTitle && title != default)
             {
                 data.Values[bindableTitle.BindingName] = title;
             }
 
-            if (progressBar.Value is BindableProgressBarValue bindableProgressValue && value != null)
+            if (progressBar.Value is BindableProgressBarValue bindableProgressValue && value != default)
             {
                 data.Values[bindableProgressValue.BindingName] = value.ToString();
             }
 
-            if (progressBar.ValueStringOverride is BindableString bindableValueStringOverride && valueStringOverride != default(string))
+            if (progressBar.ValueStringOverride is BindableString bindableValueStringOverride && valueStringOverride != default)
             {
                 data.Values[bindableValueStringOverride.BindingName] = valueStringOverride;
             }
 
-            if (progressBar.Status is BindableString bindableStatus && status != default(string))
+            if (progressBar.Status is BindableString bindableStatus && status != default)
             {
                 data.Values[bindableStatus.BindingName] = status;
             }
 
             return data;
         }
-
+#endif
 #endif
 
+        /// <summary>
+        /// Add an Attribution Text to be displayed on the toast.
+        /// </summary>
+        /// <param name="text">Text to be displayed as Attribution Text</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddAttributionText(string text)
+        {
+            return AddAttributionText(text, default);
+        }
+
         /// <summary>
         /// Add an Attribution Text to be displayed on the toast.
         /// </summary>
         /// <param name="text">Text to be displayed as Attribution Text</param>
         /// <param name="language">The target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR".</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-        public ToastContentBuilder AddAttributionText(string text, string language = default(string))
+        public ToastContentBuilder AddAttributionText(string text, string language)
         {
             AttributionText = new ToastGenericAttributionText()
             {
                 Text = text
             };
 
-            if (language != default(string))
+            if (language != default)
             {
                 AttributionText.Language = language;
             }
@@ -150,6 +160,41 @@ private IList<IToastBindingGenericChild> VisualChildren
             return this;
         }
 
+#if WINRT
+        /// <summary>
+        /// Override the app logo with custom image of choice that will be displayed on the toast.
+        /// </summary>
+        /// <param name="uri">The URI of the image. Can be from your application package, application data, or the internet. Internet images must be less than 200 KB in size.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddAppLogoOverride(Uri uri)
+        {
+            return AddAppLogoOverride(uri, default);
+        }
+
+        /// <summary>
+        /// Override the app logo with custom image of choice that will be displayed on the toast.
+        /// </summary>
+        /// <param name="uri">The URI of the image. Can be from your application package, application data, or the internet. Internet images must be less than 200 KB in size.</param>
+        /// <param name="hintCrop">Specify how the image should be cropped.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddAppLogoOverride(Uri uri, ToastGenericAppLogoCrop? hintCrop)
+        {
+            return AddAppLogoOverride(uri, hintCrop, default);
+        }
+
+        /// <summary>
+        /// Override the app logo with custom image of choice that will be displayed on the toast.
+        /// </summary>
+        /// <param name="uri">The URI of the image. Can be from your application package, application data, or the internet. Internet images must be less than 200 KB in size.</param>
+        /// <param name="hintCrop">Specify how the image should be cropped.</param>
+        /// <param name="alternateText">A description of the image, for users of assistive technologies.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddAppLogoOverride(Uri uri, ToastGenericAppLogoCrop? hintCrop, string alternateText)
+        {
+            return AddAppLogoOverride(uri, hintCrop, alternateText, default);
+        }
+#endif
+
         /// <summary>
         /// Override the app logo with custom image of choice that will be displayed on the toast.
         /// </summary>
@@ -158,24 +203,34 @@ private IList<IToastBindingGenericChild> VisualChildren
         /// <param name="alternateText">A description of the image, for users of assistive technologies.</param>
         /// <param name="addImageQuery">A value whether Windows is allowed to append a query string to the image URI supplied in the Tile notification.</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-        public ToastContentBuilder AddAppLogoOverride(Uri uri, ToastGenericAppLogoCrop? hintCrop = null, string alternateText = default(string), bool? addImageQuery = default(bool?))
+        public ToastContentBuilder AddAppLogoOverride(
+            Uri uri,
+#if WINRT
+            ToastGenericAppLogoCrop? hintCrop,
+            string alternateText,
+            bool? addImageQuery)
+#else
+            ToastGenericAppLogoCrop? hintCrop = default,
+            string alternateText = default,
+            bool? addImageQuery = default)
+#endif
         {
             AppLogoOverrideUri = new ToastGenericAppLogo()
             {
                 Source = uri.OriginalString
             };
 
-            if (hintCrop != null)
+            if (hintCrop != default)
             {
                 AppLogoOverrideUri.HintCrop = hintCrop.Value;
             }
 
-            if (alternateText != default(string))
+            if (alternateText != default)
             {
                 AppLogoOverrideUri.AlternateText = alternateText;
             }
 
-            if (addImageQuery != default(bool?))
+            if (addImageQuery != default)
             {
                 AppLogoOverrideUri.AddImageQuery = addImageQuery;
             }
@@ -183,6 +238,29 @@ private IList<IToastBindingGenericChild> VisualChildren
             return this;
         }
 
+#if WINRT
+        /// <summary>
+        /// Add a hero image to the toast.
+        /// </summary>
+        /// <param name="uri">The URI of the image. Can be from your application package, application data, or the internet. Internet images must be less than 200 KB in size.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddHeroImage(Uri uri)
+        {
+            return AddHeroImage(uri, default);
+        }
+
+        /// <summary>
+        /// Add a hero image to the toast.
+        /// </summary>
+        /// <param name="uri">The URI of the image. Can be from your application package, application data, or the internet. Internet images must be less than 200 KB in size.</param>
+        /// <param name="alternateText">A description of the image, for users of assistive technologies.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddHeroImage(Uri uri, string alternateText)
+        {
+            return AddHeroImage(uri, alternateText, default);
+        }
+#endif
+
         /// <summary>
         /// Add a hero image to the toast.
         /// </summary>
@@ -190,19 +268,27 @@ private IList<IToastBindingGenericChild> VisualChildren
         /// <param name="alternateText">A description of the image, for users of assistive technologies.</param>
         /// <param name="addImageQuery">A value whether Windows is allowed to append a query string to the image URI supplied in the Tile notification.</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-        public ToastContentBuilder AddHeroImage(Uri uri, string alternateText = default(string), bool? addImageQuery = default(bool?))
+        public ToastContentBuilder AddHeroImage(
+            Uri uri,
+#if WINRT
+            string alternateText,
+            bool? addImageQuery)
+#else
+            string alternateText = default,
+            bool? addImageQuery = default)
+#endif
         {
             HeroImage = new ToastGenericHeroImage()
             {
                 Source = uri.OriginalString
             };
 
-            if (alternateText != default(string))
+            if (alternateText != default)
             {
                 HeroImage.AlternateText = alternateText;
             }
 
-            if (addImageQuery != default(bool?))
+            if (addImageQuery != default)
             {
                 HeroImage.AddImageQuery = addImageQuery;
             }
@@ -210,6 +296,56 @@ private IList<IToastBindingGenericChild> VisualChildren
             return this;
         }
 
+#if WINRT
+        /// <summary>
+        /// Add an image inline with other toast content.
+        /// </summary>
+        /// <param name="uri">The URI of the image. Can be from your application package, application data, or the internet. Internet images must be less than 200 KB in size.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddInlineImage(Uri uri)
+        {
+            return AddInlineImage(uri, default);
+        }
+
+        /// <summary>
+        /// Add an image inline with other toast content.
+        /// </summary>
+        /// <param name="uri">The URI of the image. Can be from your application package, application data, or the internet. Internet images must be less than 200 KB in size.</param>
+        /// <param name="alternateText">A description of the image, for users of assistive technologies.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddInlineImage(Uri uri, string alternateText)
+        {
+            return AddInlineImage(uri, alternateText, default);
+        }
+
+        /// <summary>
+        /// Add an image inline with other toast content.
+        /// </summary>
+        /// <param name="uri">The URI of the image. Can be from your application package, application data, or the internet. Internet images must be less than 200 KB in size.</param>
+        /// <param name="alternateText">A description of the image, for users of assistive technologies.</param>
+        /// <param name="addImageQuery">A value whether Windows is allowed to append a query string to the image URI supplied in the Tile notification.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddInlineImage(Uri uri, string alternateText, bool? addImageQuery)
+        {
+            return AddInlineImage(uri, alternateText, addImageQuery, default);
+        }
+#endif
+
+#if WINRT
+        /// <summary>
+        /// Add an image inline with other toast content.
+        /// </summary>
+        /// <param name="uri">The URI of the image. Can be from your application package, application data, or the internet. Internet images must be less than 200 KB in size.</param>
+        /// <param name="alternateText">A description of the image, for users of assistive technologies.</param>
+        /// <param name="addImageQuery">A value whether Windows is allowed to append a query string to the image URI supplied in the Tile notification.</param>
+        /// <param name="hintCrop">A value whether a margin is removed. images have an 8px margin around them.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddInlineImage(
+            Uri uri,
+            string alternateText,
+            bool? addImageQuery,
+            AdaptiveImageCrop? hintCrop)
+#else
         /// <summary>
         /// Add an image inline with other toast content.
         /// </summary>
@@ -217,9 +353,15 @@ private IList<IToastBindingGenericChild> VisualChildren
         /// <param name="alternateText">A description of the image, for users of assistive technologies.</param>
         /// <param name="addImageQuery">A value whether Windows is allowed to append a query string to the image URI supplied in the Tile notification.</param>
         /// <param name="hintCrop">A value whether a margin is removed. images have an 8px margin around them.</param>
-        /// <param name="hintRemoveMargin">the horizontal alignment of the image.This is only supported when inside an <see cref="AdaptiveSubgroup"/>.</param>
+        /// <param name="hintRemoveMargin">This property is not used. Setting this has no impact.</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-        public ToastContentBuilder AddInlineImage(Uri uri, string alternateText = default(string), bool? addImageQuery = default(bool?), AdaptiveImageCrop? hintCrop = null, bool? hintRemoveMargin = default(bool?))
+        public ToastContentBuilder AddInlineImage(
+            Uri uri,
+            string alternateText = default,
+            bool? addImageQuery = default,
+            AdaptiveImageCrop? hintCrop = default,
+            bool? hintRemoveMargin = default)
+#endif
         {
             var inlineImage = new AdaptiveImage()
             {
@@ -231,24 +373,20 @@ private IList<IToastBindingGenericChild> VisualChildren
                 inlineImage.HintCrop = hintCrop.Value;
             }
 
-            if (alternateText != default(string))
+            if (alternateText != default)
             {
                 inlineImage.AlternateText = alternateText;
             }
 
-            if (addImageQuery != default(bool?))
+            if (addImageQuery != default)
             {
                 inlineImage.AddImageQuery = addImageQuery;
             }
 
-            if (hintRemoveMargin != default(bool?))
-            {
-                inlineImage.HintRemoveMargin = hintRemoveMargin;
-            }
-
             return AddVisualChild(inlineImage);
         }
 
+#if !WINRT
         /// <summary>
         /// Add a progress bar to the toast.
         /// </summary>
@@ -259,7 +397,7 @@ private IList<IToastBindingGenericChild> VisualChildren
         /// <param name="status">A status string which is displayed underneath the progress bar. This string should reflect the status of the operation, like "Downloading..." or "Installing...". Default to empty.</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
         /// <remarks>More info at: https://docs.microsoft.com/en-us/windows/uwp/design/shell/tiles-and-notifications/toast-progress-bar </remarks>
-        public ToastContentBuilder AddProgressBar(string title = default(string), double? value = null, bool isIndeterminate = false, string valueStringOverride = default(string), string status = default(string))
+        public ToastContentBuilder AddProgressBar(string title = default, double? value = null, bool isIndeterminate = false, string valueStringOverride = default, string status = default)
         {
             int index = VisualChildren.Count(c => c is AdaptiveProgressBar);
 
@@ -267,7 +405,7 @@ private IList<IToastBindingGenericChild> VisualChildren
             {
             };
 
-            if (title == default(string))
+            if (title == default)
             {
                 progressBar.Title = new BindableString($"progressBarTitle_{index}");
             }
@@ -289,7 +427,7 @@ private IList<IToastBindingGenericChild> VisualChildren
                 progressBar.Value = value.Value;
             }
 
-            if (valueStringOverride == default(string))
+            if (valueStringOverride == default)
             {
                 progressBar.ValueStringOverride = new BindableString($"progressValueString_{index}");
             }
@@ -298,7 +436,7 @@ private IList<IToastBindingGenericChild> VisualChildren
                 progressBar.ValueStringOverride = valueStringOverride;
             }
 
-            if (status == default(string))
+            if (status == default)
             {
                 progressBar.Status = new BindableString($"progressStatus_{index}");
             }
@@ -309,16 +447,41 @@ private IList<IToastBindingGenericChild> VisualChildren
 
             return AddVisualChild(progressBar);
         }
+#endif
+
+#if WINRT
+        /// <summary>
+        /// Add text to the toast.
+        /// </summary>
+        /// <param name="text">Custom text to display on the tile.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        /// <exception cref="InvalidOperationException">Throws when attempting to add/reserve more than 4 lines on a single toast. </exception>
+        /// <remarks>More info at: https://docs.microsoft.com/en-us/windows/uwp/design/shell/tiles-and-notifications/adaptive-interactive-toasts#text-elements</remarks>
+        public ToastContentBuilder AddText(string text)
+        {
+            return AddText(text, default, default);
+        }
 
         /// <summary>
         /// Add text to the toast.
         /// </summary>
         /// <param name="text">Custom text to display on the tile.</param>
-        /// <param name="hintStyle">Style that controls the text's font size, weight, and opacity.</param>
-        /// <param name="hintWrap">Indicating whether text wrapping is enabled. For Tiles, this is false by default.</param>
-        /// <param name="hintMaxLines">The maximum number of lines the text element is allowed to display. For Tiles, this is infinity by default</param>
-        /// <param name="hintMinLines">The minimum number of lines the text element must display.</param>
-        /// <param name="hintAlign">The horizontal alignment of the text</param>
+        /// <param name="hintMaxLines">The maximum number of lines the text element is allowed to display.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        /// <exception cref="InvalidOperationException">Throws when attempting to add/reserve more than 4 lines on a single toast. </exception>
+        /// <remarks>More info at: https://docs.microsoft.com/en-us/windows/uwp/design/shell/tiles-and-notifications/adaptive-interactive-toasts#text-elements</remarks>
+        public ToastContentBuilder AddText(string text, int? hintMaxLines)
+        {
+            return AddText(text, hintMaxLines, default);
+        }
+#endif
+
+#if WINRT
+        /// <summary>
+        /// Add text to the toast.
+        /// </summary>
+        /// <param name="text">Custom text to display on the tile.</param>
+        /// <param name="hintMaxLines">The maximum number of lines the text element is allowed to display.</param>
         /// <param name="language">
         /// The target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides any other specified locale, such as that in binding or visual.
         /// </param>
@@ -326,7 +489,36 @@ private IList<IToastBindingGenericChild> VisualChildren
         /// <exception cref="InvalidOperationException">Throws when attempting to add/reserve more than 4 lines on a single toast. </exception>
         /// <exception cref="ArgumentOutOfRangeException">Throws when <paramref name="hintMaxLines"/> value is larger than 2. </exception>
         /// <remarks>More info at: https://docs.microsoft.com/en-us/windows/uwp/design/shell/tiles-and-notifications/adaptive-interactive-toasts#text-elements</remarks>
-        public ToastContentBuilder AddText(string text, AdaptiveTextStyle? hintStyle = null, bool? hintWrap = default(bool?), int? hintMaxLines = default(int?), int? hintMinLines = default(int?), AdaptiveTextAlign? hintAlign = null, string language = default(string))
+        public ToastContentBuilder AddText(
+            string text,
+            int? hintMaxLines,
+            string language)
+#else
+        /// <summary>
+        /// Add text to the toast.
+        /// </summary>
+        /// <param name="text">Custom text to display on the tile.</param>
+        /// <param name="hintStyle">This property is not used. Setting this has no effect.</param>
+        /// <param name="hintWrap">This property is not used. Setting this has no effect. If you need to disable wrapping, set hintMaxLines to 1.</param>
+        /// <param name="hintMaxLines">The maximum number of lines the text element is allowed to display.</param>
+        /// <param name="hintMinLines">hintMinLines is not used. Setting this has no effect.</param>
+        /// <param name="hintAlign">hintAlign is not used. Setting this has no effect.</param>
+        /// <param name="language">
+        /// The target locale of the XML payload, specified as a BCP-47 language tags such as "en-US" or "fr-FR". The locale specified here overrides any other specified locale, such as that in binding or visual.
+        /// </param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        /// <exception cref="InvalidOperationException">Throws when attempting to add/reserve more than 4 lines on a single toast. </exception>
+        /// <exception cref="ArgumentOutOfRangeException">Throws when <paramref name="hintMaxLines"/> value is larger than 2. </exception>
+        /// <remarks>More info at: https://docs.microsoft.com/en-us/windows/uwp/design/shell/tiles-and-notifications/adaptive-interactive-toasts#text-elements</remarks>
+        public ToastContentBuilder AddText(
+            string text,
+            AdaptiveTextStyle? hintStyle = null,
+            bool? hintWrap = default,
+            int? hintMaxLines = default,
+            int? hintMinLines = default,
+            AdaptiveTextAlign? hintAlign = null,
+            string language = default)
+#endif
         {
             int lineCount = GetCurrentTextLineCount();
             if (GetCurrentTextLineCount() == 4)
@@ -340,22 +532,7 @@ private IList<IToastBindingGenericChild> VisualChildren
                 Text = text
             };
 
-            if (hintStyle != null)
-            {
-                adaptive.HintStyle = hintStyle.Value;
-            }
-
-            if (hintAlign != null)
-            {
-                adaptive.HintAlign = hintAlign.Value;
-            }
-
-            if (hintWrap != default(bool?))
-            {
-                adaptive.HintWrap = hintWrap;
-            }
-
-            if (hintMaxLines != default(int?))
+            if (hintMaxLines != default)
             {
                 if (hintMaxLines > 2)
                 {
@@ -369,12 +546,7 @@ private IList<IToastBindingGenericChild> VisualChildren
                 adaptive.HintMaxLines = hintMaxLines;
             }
 
-            if (hintMinLines != default(int?) && hintMinLines > 0)
-            {
-                adaptive.HintMinLines = hintMinLines;
-            }
-
-            if (language != default(string))
+            if (language != default)
             {
                 adaptive.Language = language;
             }
@@ -419,6 +591,4 @@ private int GetCurrentTextLineCount()
             return count;
         }
     }
-
-#endif
 }
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
index 91daf649407..1b50e18b70a 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
@@ -6,7 +6,6 @@
 
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
-#if !WINRT
     /// <summary>
     /// Builder class used to create <see cref="ToastContent"/>
     /// </summary>
@@ -33,7 +32,12 @@ public ToastContentBuilder()
         /// </summary>
         /// <param name="dateTime">Custom Time to be displayed on the toast</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-        public ToastContentBuilder AddCustomTimeStamp(DateTime dateTime)
+        public ToastContentBuilder AddCustomTimeStamp(
+#if WINRT
+            DateTimeOffset dateTime)
+#else
+            DateTime dateTime)
+#endif
         {
             Content.DisplayTimestamp = dateTime;
 
@@ -55,13 +59,23 @@ public ToastContentBuilder AddHeader(string id, string title, string arguments)
             return this;
         }
 
+        /// <summary>
+        /// Add info that can be used by the application when the app was activated/launched by the toast. Uses foreground activation.
+        /// </summary>
+        /// <param name="launchArgs">Custom app-defined launch arguments to be passed along on toast activation</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddToastActivationInfo(string launchArgs)
+        {
+            return AddToastActivationInfo(launchArgs, ToastActivationType.Foreground);
+        }
+
         /// <summary>
         /// Add info that can be used by the application when the app was activated/launched by the toast.
         /// </summary>
         /// <param name="launchArgs">Custom app-defined launch arguments to be passed along on toast activation</param>
         /// <param name="activationType">Set the activation type that will be used when the user click on this toast</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-        public ToastContentBuilder AddToastActivationInfo(string launchArgs, ToastActivationType activationType = ToastActivationType.Foreground)
+        public ToastContentBuilder AddToastActivationInfo(string launchArgs, ToastActivationType activationType)
         {
             Content.Launch = launchArgs;
             Content.ActivationType = activationType;
@@ -91,6 +105,30 @@ public ToastContentBuilder SetToastScenario(ToastScenario scenario)
             return this;
         }
 
+#if WINRT
+        /// <summary>
+        /// Set custom audio to go along with the toast.
+        /// </summary>
+        /// <param name="src">Source to the media that will be played when the toast is pop</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        [Windows.Foundation.Metadata.DefaultOverload]
+        public ToastContentBuilder AddAudio(Uri src)
+        {
+            return AddAudio(src, default, default);
+        }
+
+        /// <summary>
+        /// Set custom audio to go along with the toast.
+        /// </summary>
+        /// <param name="src">Source to the media that will be played when the toast is pop</param>
+        /// <param name="loop">Indicating whether sound should repeat as long as the Toast is shown; false to play only once (default).</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddAudio(Uri src, bool? loop)
+        {
+            return AddAudio(src, loop, default);
+        }
+#endif
+
         /// <summary>
         /// Set custom audio to go along with the toast.
         /// </summary>
@@ -98,7 +136,15 @@ public ToastContentBuilder SetToastScenario(ToastScenario scenario)
         /// <param name="loop">Indicating whether sound should repeat as long as the Toast is shown; false to play only once (default).</param>
         /// <param name="silent">Indicating whether sound is muted; false to allow the Toast notification sound to play (default).</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-        public ToastContentBuilder AddAudio(Uri src, bool? loop = null, bool? silent = null)
+        public ToastContentBuilder AddAudio(
+            Uri src,
+#if WINRT
+            bool? loop,
+            bool? silent)
+#else
+            bool? loop = default,
+            bool? silent = default)
+#endif
         {
             if (!src.IsFile)
             {
@@ -108,12 +154,12 @@ public ToastContentBuilder AddAudio(Uri src, bool? loop = null, bool? silent = n
             Content.Audio = new ToastAudio();
             Content.Audio.Src = src;
 
-            if (loop != null)
+            if (loop != default)
             {
                 Content.Audio.Loop = loop.Value;
             }
 
-            if (silent != null)
+            if (silent != default)
             {
                 Content.Audio.Silent = silent.Value;
             }
@@ -151,11 +197,23 @@ public Windows.Data.Xml.Dom.XmlDocument GetXml()
             return GetToastContent().GetXml();
         }
 
+        /// <summary>
+        /// Shows a new toast notification with the current content.
+        /// </summary>
+        public void Show()
+        {
+            CustomizeToast customize = null;
+            Show(customize);
+        }
+
         /// <summary>
         /// Shows a new toast notification with the current content.
         /// </summary>
         /// <param name="customize">Allows you to set additional properties on the <see cref="Windows.UI.Notifications.ToastNotification"/> object.</param>
-        public void Show(Action<Windows.UI.Notifications.ToastNotification> customize = null)
+#if WINRT
+        [Windows.Foundation.Metadata.DefaultOverload]
+#endif
+        public void Show(CustomizeToast customize)
         {
             var notif = new Windows.UI.Notifications.ToastNotification(GetToastContent().GetXml());
             customize?.Invoke(notif);
@@ -163,20 +221,76 @@ public void Show(Action<Windows.UI.Notifications.ToastNotification> customize =
             ToastNotificationManagerCompat.CreateToastNotifier().Show(notif);
         }
 
+        /// <summary>
+        /// Shows a new toast notification with the current content.
+        /// </summary>
+        /// <param name="customize">Allows you to set additional properties on the <see cref="Windows.UI.Notifications.ToastNotification"/> object.</param>
+        /// <returns>An operation that completes after your async customizations have completed.</returns>
+        public Windows.Foundation.IAsyncAction Show(CustomizeToastAsync customize)
+        {
+            return ShowAsyncHelper(customize).AsAsyncAction();
+        }
+
+        private async System.Threading.Tasks.Task ShowAsyncHelper(CustomizeToastAsync customize)
+        {
+            var notif = new Windows.UI.Notifications.ToastNotification(GetToastContent().GetXml());
+
+            if (customize != null)
+            {
+                await customize.Invoke(notif);
+            }
+
+            ToastNotificationManagerCompat.CreateToastNotifier().Show(notif);
+        }
+
+        /// <summary>
+        /// Schedules the notification.
+        /// </summary>
+        /// <param name="deliveryTime">The date and time that Windows should display the toast notification. This time must be in the future.</param>
+        public void Schedule(DateTimeOffset deliveryTime)
+        {
+            CustomizeScheduledToast customize = null;
+            Schedule(deliveryTime, customize);
+        }
+
         /// <summary>
         /// Schedules the notification.
         /// </summary>
         /// <param name="deliveryTime">The date and time that Windows should display the toast notification. This time must be in the future.</param>
         /// <param name="customize">Allows you to set additional properties on the <see cref="Windows.UI.Notifications.ScheduledToastNotification"/> object.</param>
-        public void Schedule(DateTimeOffset deliveryTime, Action<Windows.UI.Notifications.ScheduledToastNotification> customize = null)
+#if WINRT
+        [Windows.Foundation.Metadata.DefaultOverload]
+#endif
+        public void Schedule(DateTimeOffset deliveryTime, CustomizeScheduledToast customize)
         {
             var notif = new Windows.UI.Notifications.ScheduledToastNotification(GetToastContent().GetXml(), deliveryTime);
             customize?.Invoke(notif);
 
             ToastNotificationManagerCompat.CreateToastNotifier().AddToSchedule(notif);
         }
-#endif
-    }
 
+        /// <summary>
+        /// Schedules the notification.
+        /// </summary>
+        /// <param name="deliveryTime">The date and time that Windows should display the toast notification. This time must be in the future.</param>
+        /// <param name="customize">Allows you to set additional properties on the <see cref="Windows.UI.Notifications.ScheduledToastNotification"/> object.</param>
+        /// <returns>An operation that completes after your async customizations have completed.</returns>
+        public Windows.Foundation.IAsyncAction Schedule(DateTimeOffset deliveryTime, CustomizeScheduledToastAsync customize)
+        {
+            return ScheduleAsyncHelper(deliveryTime, customize).AsAsyncAction();
+        }
+
+        private async System.Threading.Tasks.Task ScheduleAsyncHelper(DateTimeOffset deliveryTime, CustomizeScheduledToastAsync customize = null)
+        {
+            var notif = new Windows.UI.Notifications.ScheduledToastNotification(GetToastContent().GetXml(), deliveryTime);
+
+            if (customize != null)
+            {
+                await customize.Invoke(notif);
+            }
+
+            ToastNotificationManagerCompat.CreateToastNotifier().AddToSchedule(notif);
+        }
 #endif
+    }
 }
diff --git a/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs b/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
index 663b8203401..16c66aefe1c 100644
--- a/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
+++ b/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
@@ -429,12 +429,14 @@ public void AddTextTest_WithTextAndFullOptions_ReturnSelfWithTextAndAllOptionsAd
             var text = builder.Content.Visual.BindingGeneric.Children.First() as AdaptiveText;
 
             Assert.AreEqual(testText, (string)text.Text);
-            Assert.AreEqual(testStyle, text.HintStyle);
-            Assert.AreEqual(testWrapHint, text.HintWrap);
             Assert.AreEqual(testHintMaxLine, text.HintMaxLines);
-            Assert.AreEqual(testHintMinLine, text.HintMinLines);
-            Assert.AreEqual(testAlign, text.HintAlign);
             Assert.AreEqual(testLanguage, text.Language);
+
+            // These values should still be the default values, since they aren't used for top-level text
+            Assert.AreEqual(AdaptiveTextStyle.Default, text.HintStyle);
+            Assert.IsNull(text.HintWrap);
+            Assert.IsNull(text.HintMinLines);
+            Assert.AreEqual(AdaptiveTextAlign.Default, text.HintAlign);
         }
 
         [TestMethod]

From 1b0c403ae4b29efbf3014c4fe2ca4c4dcd1cef59 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Tue, 13 Oct 2020 12:23:16 -0700
Subject: [PATCH 33/46] Catch exception on initialization to avoid crashing
 entire app

Throw it when they perform operations like showing a toast (where they're more likely to have try/catches themselves)
---
 .../Compat/ToastNotificationManagerCompat.cs  | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
index b11ab196573..fd4f3929a23 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -49,7 +49,14 @@ public static event OnActivated OnActivated
                     if (!_registeredOnActivated)
                     {
                         // Desktop Bridge apps will dynamically register upon first subscription to event
-                        CreateAndRegisterActivator();
+                        try
+                        {
+                            CreateAndRegisterActivator();
+                        }
+                        catch (Exception ex)
+                        {
+                            _initializeEx = ex;
+                        }
                     }
 
                     _onActivated.Add(value);
@@ -97,10 +104,19 @@ internal static void OnActivatedInternal(string args, Internal.InternalNotificat
 
         private static string _win32Aumid;
         private static string _clsid;
+        private static Exception _initializeEx;
 
         static ToastNotificationManagerCompat()
         {
-            Initialize();
+            try
+            {
+                Initialize();
+            }
+            catch (Exception ex)
+            {
+                // We catch the exception so that things like subscribing to the event handler doesn't crash app
+                _initializeEx = ex;
+            }
         }
 
         private static void Initialize()
@@ -320,6 +336,11 @@ private static extern int CoRegisterClassObject(
         public static ToastNotifier CreateToastNotifier()
         {
 #if WIN32
+            if (_initializeEx != null)
+            {
+                throw _initializeEx;
+            }
+
             if (DesktopBridgeHelpers.HasIdentity())
             {
                 return ToastNotificationManager.CreateToastNotifier();
@@ -341,6 +362,11 @@ public static ToastNotificationHistoryCompat History
             get
             {
 #if WIN32
+                if (_initializeEx != null)
+                {
+                    throw _initializeEx;
+                }
+
                 return new ToastNotificationHistoryCompat(DesktopBridgeHelpers.HasIdentity() ? null : _win32Aumid);
 #else
                 return new ToastNotificationHistoryCompat(null);

From e94afd0864a3f333ee56a23d7cd0cc7f815c6a6d Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Wed, 28 Oct 2020 21:30:06 -0600
Subject: [PATCH 34/46] Update icon

---
 ...osoft.Toolkit.Win32.WpfCore.SampleApp.csproj |   2 +-
 .../Office.ico                                  | Bin 7886 -> 0 bytes
 .../ToolkitIcon.ico                             | Bin 0 -> 19277 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp/Office.ico
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp/ToolkitIcon.ico

diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
index 5666136b585..aa80e5130f5 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj
@@ -4,7 +4,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
-    <ApplicationIcon>Office.ico</ApplicationIcon>
+    <ApplicationIcon>ToolkitIcon.ico</ApplicationIcon>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Office.ico b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Office.ico
deleted file mode 100644
index 527da4c0c98e0b3d72b738b8c30a21ba84931581..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7886
zcmcgx3vg7`89tXl5;m{RlO&sDHwg)WfQF(JijeRSsv-^Iqe3eYYjw1hNK0)MWfc_=
zFgOY#pbLl)p%4&|0^*_pAtA6po^)C^+Nm&Bn(!L1!|?SxySZ?4b8iv?CNtlh$36f5
zo&V(K-2eL{gdzfj!y(u@M6p$ffkKG*c>j1#cOg!2&PvGVPj(gJw~0bzaScsG9wFy{
zjGvx8_Bre^yYj+&?fY>EOg5ckKjFwus&;3@mx26<kKP1JrrV<osVgG#Ow4Y0dT`J0
ztOL`&b@jK`BRi=E8S&-h{|pI{8xd{&5ad?Tz`lzpAo!cP@t?e`v(6zI-#3sSe*W4f
z{@p(Qn6MQpw^1w4rm!Qs7~S`OId^9N;LYoO4ns0dL*?(AREx~`gK)&`Mq*?MV!~D$
z@#^P_u6GaQcatA2`RmAELH^Ilzp1_a=m39FtNgKU@^3~=_$qy@hU2#QcTB1CY%8ck
z$s@Ji;z_l6ZLQZn=kM5%Q#-F+Z`9v1xegnCU5m97Yq0X68oYOZwfn97svM)W`Z+C+
zSzm9XAFuyaEml8VgAX38#^MQ8DEdVuW{<7(>em^K%{aC5Mt0h{Rllsk(g&*X_V_By
z8&`>0cOSzGV~)1#z0vZR^|f3^{dXr+V_|+3=8Ua`^R8of?#`o_I{Zkd@h@P^uibMD
zGZ^z9M;^h`xgJaza=6p@UuMjI8GRImBaYySVIDj(_%QCjy`t0jr;j><-{pDm*d2#4
zanK>;52(QCTMu>`|C5Y)^3M+Afq{oGw*Ntl=vR(GS!JEZKZ!AqzpVm4&pC*p+2t6}
zs|<b8_IDcpy+5hI$Xm)WxOW+D%{YLp)US}?*w<<NxqZuVJ7dmH-;Ycm_g<vizic1>
zu;WnLfYIN)b}mQ8%=6A<%suU;NKg3!Y02*P@sIpFls2H{GV1qgin%9aPD|N?)a1|M
zNcs#ZwjFKeG0NTlfGO_cGs1{dJ9jna6gM2nyJ1h-CApE5xIJIH&Zw{4cLFUio^u))
z*=gsR$Gj8CiGL&ar$~(7+7RDkbE|t$Ce=fk*gCXaM*Y<0F~gRyjoe#6ZuE#NL0s&H
zhM1UjMN!ekExyUhZ~ld=c#M4m7;$Rn?6#dH$u@t?wuG%ni2sD#o5;Npv9W&zxj}A3
zMy-K0a<w<yy3!eDbvdLD<(Y4xJoE2s_&xhNXt|8~Ja21K!ly17bApVy2V;)gK<@R3
zj`^6}Ysvi)A|gKoxe*rOLP+>>Si;`*D1SbMR`J}aHs3#WPdx7&#_U#Oj+QY;Gv=t(
z<X(j^>k5QMd_eA{=pMER!68LZX8p$;ukab6`fqQ`^Ui0?-WD-OFy`<j=pOnuf<hLc
zo8>i#qW@mQo9yc`|MYd|-|9Yj-p+9AiUxno%NX-w1cxp}pk*$)T3$gw@beJM&O$6b
z(-KS0c*NqyLe*DC+t7&jt(NemuI{1lG{yWnx^{mF0YQI)Vw(xE_JSX4&U?k`^DeRK
zT!C15&e~BvGrPc$c{$xIuet+*UqF|jX;31kLCiW*A~szt6dNzL_`5XobEETJf}V9K
zfluY#h#y?Z1ug{v^<pOW2s>ZU2o;T}k7&%jPT09#B7#r|;UGlBW!10bkX(}U%1p>Q
z1xp!19@@>SQ}j+eR*)W7>P(8-lFvN+rv3g0rk~8~Z})op*ea18w->gkPY{;2OKL7R
zQAju##&!RU=zSq)Xl8?ZQ2HtKchsYgt*XiY7Q}|P(A8e@$T~;6;-Y?bj>^7>VZ9pA
z-2Xl#MQx>jQ{C!mEsz~kj{ErOzeMjp+g8o}e?|Y>=)YNAq?tZ7^S}Mkx`xfvp~aJG
zT&{<z9cJs)d7ecxzv@_hu5UL|->#v)eV-cho%^aV_uk3^{Tl69^`~#OYqWi-A*q{D
zL>(u!)brFc+UNSd-mf~=uT#g1xM!(NrB<3g>L{L~MpK^|wW>dTYqVC*QE&V7-?P+U
zj}JYJhkttLruvtfR%)yQ>YNGGc4OMmSNeUcW3&A~G1TMJZsVvWhEqS?#(dsvt(;f=
z>02`!sm-K58q%i>xAZ&!nKPTM?TCM=e+E+XN!=y2kIcne^?wK7e*>7=NR8pk^PBXA
z%<;|E`u0D9y21cvHh%5m*AKoN-sa1r9cJs5d#DWzV76XrqEu?4CS4-60TL6o7MiVB
z9`wQpX6w})T;~4Q^6yPD4|U0WOmC-5VXp1NH*ASV{m`#d$0@d*Zn<YQzm|EunrF)V
zmN}-(tBaUx<wzT4D)VYRm}{&4^ey#@mFMA<njy}YxBGKvnX{{TGjl0l{umtkmREW4
zJ2b-#jtRYA{g}QTF|q4i{yoc_T;|0xANS{nK_PGY^V0duMYWj6@f)XG{k~|qcpiB?
z54X%cE#dF^a^Ap@H<<f5nSV`(SkAmt#j-PAvE)pVSk!3M`e;v|`E-78$U<*7%j?W%
zXV7;cl>9Xi>n^xO@%cir=Dedle%e~Yys@B5&{U@q_;|k9{zJR=iLW8x%oSHekhn~o
z7eV;?N)YN>LU67*UgB6Hh3G=i_7Xu~pij`ZFAtL&kpXrj4;$e4#@aWj#+4fDc3U00
zoV-hY?`~UXA)gP+YIO4d3Jrae>yR4z1$soRRlnyl*KxJxi}{BqH|wnL{}Mj?xG!m6
ztlFz>gV{c4?^W&lB_BsxTq*6>sdiUez5N!}=vgE8vR<37e<sImeM@AHAajpbnICk-
zegW&^FS17aG{2)Av6ppDS>u%T&5qd1I-&e-56C>wA$wV8>&F^fhJCNG{cwJBB=Y>w
z?@`tT<#$njyI8Ym@vbT3SoazC&#Tbe%Q}zze#kqXwFWQmU?=Z(hq_Lg%sX5IbzW^{
zorHA?UwuU0v9c~AH99r2hj&zg@`sbSifJbeW0dtI-uqrzPhl;^cXwLCmQdTyhnRaB
zVonoge{cH!%Kb=f&ilMU)&c@8vw3&%PF!&g!gbawmYs3&K5TJ5Y8-0Id(Ya<GRs9x
y=~l)pcT&q5+FZ8R;Zi^y8k?}cv<~}Ah0vpvb9+iX*b{IF^#K*MDaU1d8U7CqG}}l3

diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/ToolkitIcon.ico b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/ToolkitIcon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..e3aaf6fccfbd16811d58d2671821a800d41fcff8
GIT binary patch
literal 19277
zcmeHP3s_WD9zP=p`DWL?RZ<w#ZH;yf_fuEigRf9C5HYk2#Y{!<f#w?p%*}L-Sa+>V
z<I%RJh+;%Yo5jNvwukaYF@*sNS`h+7Kwh)|-^{(!aG7C-VJ53@&iDQNpYuQe*ZJRb
z&pr3d6~;uYKeMu8MD19hIb(i|v5_Mc?E?cCOC_G2ouYk;<enVL*u;rk`%%VfZApO&
z^iwPtdvhjZk5QXMiKE~XVT|m2PP%}hO78rrwta+@^!oxC=^G05WUG__Dzw>CA7mTy
ze4Ur(`Z!LKQ);W&=&7%b<SGf5NY|0*NseBkdN~Jmeb9j}a_34INf<+j=cqMNF$dID
z`ydM)=-wpQ5g5UoFoL7XDWa~Ac+i2aQeUZ{rNY_c^`+EyBOq4rc#3#cq1p!-=twD7
z8ALM)pqB~797X#g2X%d!(9K)uGMr?_5O|wkP~C-K!|}jJ9X#~$v5tW*KUCr~0%AlA
z$gNNxJoG_^S5s25#RyguQyleUJm~@;-nhJlu2zs0mg_-&EX#fnY+yW(sss8U16jVv
zWPD9M9e0T_Nqg5msU>4T-7v*ELrWE-<w(B%$R%mbGW0srHG-eMMft=$FeapA-<Xh*
zeG_!ffn#Id0_PKS&xPhKa5|9d<CLc{f9R9TK$djoJ2q;R<@`gg;Q3htNe*lApgcc!
z5As#lO^<kaer_I+foy^Qtbqz2TCSy!V;JNKShIp@45Nvb5rlJ~jOz>LWJgjQ&=ty|
zjWsEhu$SOYz#8{0A)GLn02`>Q0zCAA2U+Mq7dBukoxuBojQr*XC5$2<{>^A>D(K^6
zAPXH;8?dR#KAv}wx8ilw`9L2h16k;3wXe=jZ+V<wwek1XmOA;L*nTJZ%OGGpxb`n|
z6m5WSqfZF*@p3}l4C?EoJy#4-DFJhgM-|oE3D}GAJWUibkcEz_j1;!>pPfE{?s4HW
z-I<d=OceK*SOd@p8Q6x-k9No=Yzwas$uI)!Ar_2TD57kmkCTBcbd-IXDx3~vD+s#A
z4_Te;=RM=f@}6;fnAVc7NC)eoYEISF8zBoF=xQs4%b#M&Bt-H~q_>CcBS-uk5z@Vo
zf$WE*1Kppx$Y`Sl=u#YIqZuHPwJV{j*CG?M7N!76$nD~N&yL_hz<Z#)&<o(NZ6Br>
z*e~~AnxnXX9wemX|3N}V{!K9DKsX0FX^sAY=0=$uiaPcTLOEeuU%f7N=oz1wzj)eI
z+FRRDou0{5C!RL{`s#JDOJmJn?BRIHhB4yftj79tYsSFia?&MMrLMku-E&$-<FMs?
zXAuRgIUcTudjE8-^weu3o7e+j9V#c_yaVILz6fmqb@0%Kws6hrjUIf#CqE9foe2Cs
z4Ey?i1mpmA0o1`mpI8HQ(Sr~8f=}K*atfQu2N~)F*yHn$y0TwWMVlVi4_~U+QImgj
zl7n9Wbxm%Se8_OJYW28&t^Sn;4O}t#SH4H|c>N8WcBMHD`4`@Qm><SM*Za@Mv7UV4
zJ+G3$-|MOrc>+{<y3~8pgRgd4%j@YKB$#L+wec<`w5yQoIX<Bd+S>Fg;1j-!R(hEc
z#Tmaa-+Z263s7Ajg|ez`o%G-nzLgV0P$7R<M_`v9AL;_B?oEC5gqHNRqpzM8|N7=1
zxzj0cLjQDq@Gd=q=1BqBz`hGH@Yg~cg)H`A1$0(9f*>@nwOvH-<dxBfMHIseWT%Mi
zsk=Wk#ew-<M7k@!J$6W>@B4jWz#K+%w4Xc=iacTupbNy%fi7(PoC}>nD2ui@MRw-l
zsxr3XmK}gtCTmfJstoF#;+8Nu7z^v<KqntE6r5Awx1s=o@|@!LrgI8PhpCt{@T<vy
zj_al_YwLrO;rDaDR4SuuV1g+Jra54m1Ex7(ygAT8zYEvWT8np+GI|dwr#8;9JNmHx
z8pCGyIpE_&-<G)VD_rV1iM}fn=X(FemfmCR3YX2E1U`N9QrGJ-7{jK9Ylj%iBE!s7
zzh}b+3T^Q7{oMcB+xU%PQ*8`1X9|{jPA*t7L-qVrOtSK`SMbr#&8_a&PF+rnVN;zS
z1+Sduj2(SD#GhMdQtUX_104lE`l*ilLbv!y)(AE=`NqBudrQO*iZ*05@io~|<!jQ_
z#8=hTRBxl0kXI=e8*Cw`@;npmDSpf)$SKw)#n_;)4t=qS*bpOP6^;XZ{w$H-%ZrI8
zpXWq-ir<`*gFLURiT1@Ne};)zh4Cw|ow}E^p5j+0uM4lYHr2?hjzO3B`FVozE9aFi
zv8t2d;?dcr0peGkC(3!HE;e0wTs%74>`VN*#A9q3Q~buxaL@Kl`R_SD#_l!c-`E-M
z*}j(i<C!GfKWN$mJScwm{ezEVE5(iHa2o+*P~E?&+kZVsUf2B_#ZKSgYW?<!8=vZ4
z<7ZK)*gq@`m^+r}JM=zYLUHz#+pc3b%=OaGCdG=F5qr@K^VqdDzLxYpj{S_7plNOk
z=bj<%7kzBvH_%at8L{hHXk3gN8?F)N4=Bc}tBG!M(B*6x%w{(y9K#sCjA7Fhzoray
z=Re^58{_`%^F7r)O9~FY^^mVoK8`mjZ@7OA@x1H0ev)nY(C51nO>y&lTCZ4f@bmrU
z&x-Ev{swuTk?pAB;3fU91^V)C4MuN;uV*+bq-O@5-MU8U@VvuZ&<%>`Q50;$2YeZ;
z^x}D^={YFm>-9V`*7!_zdzS(E$3px^Lp{*mS?z_in9={SqGA^=qCcCVl@622WR`V|
zb)y&v_`RfX*;5Her-(kPf?woEBV|m{FQD?6NRI|7R+Ha@^SwNW418oDc^NWi_RIxx
zXXNl9`uig6`OT+RF=i1uXXdnpJ8sn6k_7r!*<_V1irXJ6efMgPBrfsK|MrSIxc`xP
zxxX7`JvYPR*%xPLSUVpbx@MN;a@W6EP1`i?wVa%3`<{91aE8S{r|tXnV8DEf{{6@H
zo4)n&;~o=+j9nZ1L~XzyH~rS$Z}WR?B_XNVNpsJKHh<b2S{rh;F!3oGcbDS)w0Di@
zlgljyH*)eCie71!+`N6xZP0~~`d3mfS7f!8?C40YDoJpAYN}QE_>s2$Z@<0l`sg!m
zmZc@>2hA2a_`B{p-!wXE9@|!5`E8bi|8f7AcsI+lE_WL;e8*J{yLHCRbNsH;O)M(#
z#dTXR9!hgcxRQ_^@!DChg6Q{#7mIekG9m0Gr$<|yUBa_oBkqp+sn^;sR>nr9zf~-9
zEq_PyYEZvrR^gsr(MxyF53#sWRdg>jyQBQ!*dq<W)ys$xv}4Q4_nQVsdGtTDUAAzW
zXd7F(d+qvDO@j-T*YuD5(}a!wr`*i8E)Eer7Mdb?D|rMv@CRl!kJ&BWNP~`w{KxHv
z-)soF!|aYSkBOr2fPO5)oV`4NnGa_VDFhADalT6SO(?|`xMpYd#WwMVd)I6qxn6w8
zp>cw(q^LQw`kY&H)6!JgL6I`S9qHj4S4%JLjeqM2Ter5SOOt|F$vf>WCxViyUrH96
z=Ny~lAa<RyxijZVRO<PPDdC3`3kNua2JT1yxE1lkUG~%jxv(Xnf$v9o4M_dSY^3#)
zsJil3R~@6P*M8eede<iWrO^M@wM^NYZ5G_nSibMZK2go4>Rn;p_K{wqZ5KS)<ovqt
zzno_uxs8={jLAM*-QngP;eB>Up{;pfT76vdyW-KUm+z;AHT)p!{J3eNN65X#BQed_
zJ7+wx-E2CS%3Vu32AvOkmj$NzohvIA88gFrU92-HO)NRe^|O}PHzZ*gdrj8gziv&=
z9NN1nFhLf=&Xz>pI=vw+=0a0_{FT<im6pAlNFPL#>is(#qdW3r!emJ)YqRV9+rQf=
zYpwX&rMdIDkk^l$S?0fuS)Hji3zl{66BkC0*|aSy_QLAYqI;sn&z0;t(KPsAl8ePH
zx3=>M!_qzDV{GEwW|ZG~ecJZy)U(xQ^XJ+RUsOA|AbQO5%8tB<tbdJKT{34}zq;Cx
z<N3*}XCK{}wxuHR`^>ku=N(|XKWZ&L{Kfw+yc(39xCmO4m$$X-NesO=c`Q3|Wb=v*
z9s6!fx>M*fb?U01?3^`cmf1uMNdGLNEqice!q)}S6?67`E?QN){$|+wv@T?}7Umvh
zM;3fZH?{Qp@4l&8o1J((_p6lbD-P?17Dd13`)pcM&_XuX{=3YZnG46eAAHiG)P4Jk
z4J%HQ^3~SlMb}CPeQ<p5aLa_HpX_K{SK~By=f~^U-EheYO$x2ay$;Jsk~<xZDJO?^
zHnhh}?yruBkvQ#Xu8a83y<x|;T)pm9v{5$2nSB#2X=uECE^Mo`P|{v|@@`GbP7LkS
zwvx&%zV45ozS3F~bAY+l-XG_E4!2}vNlCQ#T>BGmEb$qC@(0__Mv2VD_sh>m&3N<8
zl%;ca<Q2Twk-BV?h^6Ly>@5oa%&@D4UUQk&H04s&WqnuED3!{N?!J39YQ|0aLo|%d
NndLPzVS2#J{|7T&m`4Br

literal 0
HcmV?d00001


From 8b696d4675f5f94bfd5e621ed5dd9b1b299e520d Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 29 Oct 2020 08:40:35 -0600
Subject: [PATCH 35/46] Added ToastArguments

---
 .../Builder/ToastContentBuilder.Actions.cs    |  51 +++-
 .../Toasts/Builder/ToastContentBuilder.cs     |  27 ++
 .../Toasts/ToastArguments.cs                  | 269 ++++++++++++++++++
 .../App.xaml.cs                               | 104 ++++++-
 .../MainWindow.xaml                           |  28 +-
 .../MainWindow.xaml.cs                        | 131 ++++++++-
 6 files changed, 593 insertions(+), 17 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs
index 49a6da09198..8f35a959b17 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs
@@ -48,6 +48,37 @@ private IList<IToastInput> InputList
             }
         }
 
+        /// <summary>
+        /// Add a button to the current toast.
+        /// </summary>
+        /// <param name="content">Text to display on the button.</param>
+        /// <param name="activationType">Type of activation this button will use when clicked. Defaults to Foreground.</param>
+        /// <param name="arguments">App-defined arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+#if WINRT
+        [Windows.Foundation.Metadata.DefaultOverload]
+#endif
+        public ToastContentBuilder AddButton(string content, ToastActivationType activationType, ToastArguments arguments)
+        {
+            return AddButton(content, activationType, arguments.ToString());
+        }
+
+        /// <summary>
+        /// Add a button to the current toast.
+        /// </summary>
+        /// <param name="content">Text to display on the button.</param>
+        /// <param name="activationType">Type of activation this button will use when clicked. Defaults to Foreground.</param>
+        /// <param name="arguments">App-defined arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
+        /// <param name="imageUri">Optional image icon for the button to display (required for buttons adjacent to inputs like quick reply).</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+#if WINRT
+        [Windows.Foundation.Metadata.DefaultOverload]
+#endif
+        public ToastContentBuilder AddButton(string content, ToastActivationType activationType, ToastArguments arguments, Uri imageUri)
+        {
+            return AddButton(content, activationType, arguments.ToString(), imageUri);
+        }
+
         /// <summary>
         /// Add a button to the current toast.
         /// </summary>
@@ -68,9 +99,6 @@ public ToastContentBuilder AddButton(string content, ToastActivationType activat
         /// <param name="arguments">App-defined string of arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
         /// <param name="imageUri">Optional image icon for the button to display (required for buttons adjacent to inputs like quick reply).</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-#if WINRT
-        [Windows.Foundation.Metadata.DefaultOverload]
-#endif
         public ToastContentBuilder AddButton(string content, ToastActivationType activationType, string arguments, Uri imageUri)
         {
             // Add new button
@@ -87,6 +115,23 @@ public ToastContentBuilder AddButton(string content, ToastActivationType activat
             return AddButton(button);
         }
 
+        /// <summary>
+        /// Add an button to the toast that will be display to the right of the input text box, achieving a quick reply scenario.
+        /// </summary>
+        /// <param name="textBoxId">ID of an existing <see cref="ToastTextBox"/> in order to have this button display to the right of the input, achieving a quick reply scenario.</param>
+        /// <param name="content">Text to display on the button.</param>
+        /// <param name="activationType">Type of activation this button will use when clicked. Defaults to Foreground.</param>
+        /// <param name="arguments">App-defined arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
+        /// <param name="imageUri">An optional image icon for the button to display (required for buttons adjacent to inputs like quick reply)</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+#if WINRT
+        [Windows.Foundation.Metadata.DefaultOverload]
+#endif
+        public ToastContentBuilder AddButton(string textBoxId, string content, ToastActivationType activationType, ToastArguments arguments, Uri imageUri)
+        {
+            return AddButton(textBoxId, content, activationType, arguments.ToString(), imageUri);
+        }
+
         /// <summary>
         /// Add a button to the current toast.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
index 1b50e18b70a..3f635cdae6d 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
@@ -59,6 +59,33 @@ public ToastContentBuilder AddHeader(string id, string title, string arguments)
             return this;
         }
 
+        /// <summary>
+        /// Add info that can be used by the application when the app was activated/launched by the toast. Uses foreground activation.
+        /// </summary>
+        /// <param name="launchArgs">Custom app-defined launch arguments to be passed along on toast activation</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+#if WINRT
+        [Windows.Foundation.Metadata.DefaultOverload]
+#endif
+        public ToastContentBuilder AddToastActivationInfo(ToastArguments launchArgs)
+        {
+            return AddToastActivationInfo(launchArgs.ToString());
+        }
+
+        /// <summary>
+        /// Add info that can be used by the application when the app was activated/launched by the toast.
+        /// </summary>
+        /// <param name="launchArgs">Custom app-defined launch arguments to be passed along on toast activation</param>
+        /// <param name="activationType">Set the activation type that will be used when the user click on this toast</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+#if WINRT
+        [Windows.Foundation.Metadata.DefaultOverload]
+#endif
+        public ToastContentBuilder AddToastActivationInfo(ToastArguments launchArgs, ToastActivationType activationType)
+        {
+            return AddToastActivationInfo(launchArgs.ToString(), activationType);
+        }
+
         /// <summary>
         /// Add info that can be used by the application when the app was activated/launched by the toast. Uses foreground activation.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
new file mode 100644
index 00000000000..068f683899b
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
@@ -0,0 +1,269 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    /// <summary>
+    /// A portable string serializer/deserializer for .NET.
+    /// </summary>
+    public sealed class ToastArguments : IEnumerable<KeyValuePair<string, string>>
+    {
+        private Dictionary<string, string> _dictionary = new Dictionary<string, string>();
+
+#if !WINRT
+        /// <summary>
+        /// Gets the value of the specified key. Throws <see cref="KeyNotFoundException"/> if the key could not be found.
+        /// </summary>
+        /// <param name="key">The key to find.</param>
+        /// <returns>The value of the specified key.</returns>
+        public string this[string key]
+        {
+            get
+            {
+                if (key == null)
+                {
+                    throw new ArgumentNullException(nameof(key));
+                }
+
+                if (TryGetValue(key, out string value))
+                {
+                    return value;
+                }
+
+                throw new KeyNotFoundException($"A key with name '{key}' could not be found.");
+            }
+
+            set
+            {
+                if (key == null)
+                {
+                    throw new ArgumentNullException(nameof(key));
+                }
+
+                _dictionary[key] = value;
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Attempts to get the value of the specified key. If no key exists, returns false.
+        /// </summary>
+        /// <param name="key">The key to find.</param>
+        /// <param name="value">The key's value will be written here if found.</param>
+        /// <returns>True if found the key and set the value, otherwise false.</returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("found")]
+#endif
+        public bool TryGetValue(string key, out string value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            return _dictionary.TryGetValue(key, out value);
+        }
+
+        /// <summary>
+        /// Gets the number of key/value pairs contained in the toast arguments.
+        /// </summary>
+        public int Count => _dictionary.Count;
+
+        /// <summary>
+        /// Adds a key (without a value) to the arguments. If the key already exists, throws an exception.
+        /// </summary>
+        /// <param name="key">The name of the parameter.</param>
+        public void Add(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            _dictionary.Add(key, null);
+        }
+
+        /// <summary>
+        /// Adds a key and optional value to the arguments. If the key already exists, throws an exception.
+        /// </summary>
+        /// <param name="key">The name of the parameter.</param>
+        /// <param name="value">The optional value of the key.</param>
+        public void Add(string key, string value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            _dictionary.Add(key, value);
+        }
+
+        /// <summary>
+        /// Sets a key. If there is an existing key, it is replaced.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        public void Set(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            _dictionary[key] = null;
+        }
+
+        /// <summary>
+        /// Sets a key and optional value. If there is an existing key, it is replaced.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The optional value of the parameter.</param>
+        public void Set(string key, string value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            _dictionary[key] = value;
+        }
+
+        /// <summary>
+        /// Determines if the specified key is present.
+        /// </summary>
+        /// <param name="key">The key to look for.</param>
+        /// <returns>True if the key is present, otherwise false.</returns>
+        public bool Contains(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            return _dictionary.ContainsKey(key);
+        }
+
+        /// <summary>
+        /// Determines if specified key and value are present.
+        /// </summary>
+        /// <param name="key">The key to look for.</param>
+        /// <param name="value">The value to look for when the key has been matched.</param>
+        /// <returns>True if the key and value were found, else false.</returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("doesContain")]
+#endif
+        public bool Contains(string key, string value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            return _dictionary.TryGetValue(key, out string actualValue) && actualValue == value;
+        }
+
+        /// <summary>
+        /// Removes the specified key and its associated value.
+        /// </summary>
+        /// <param name="key">The key to remove.</param>
+        /// <returns>True if the key was removed, else false.</returns>
+        public bool Remove(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            return _dictionary.Remove(key);
+        }
+
+        private static string UrlEncode(string str)
+        {
+            return Uri.EscapeDataString(str)
+
+                // It incorrectly encodes spaces as %20, should use +
+                .Replace("%20", "+");
+        }
+
+        private static string UrlDecode(string str)
+        {
+            // Doesn't handle decoding the +, so we manually do that
+            return Uri.UnescapeDataString(str.Replace('+', ' '));
+        }
+
+        /// <summary>
+        /// Parses a string that was generated using ToastArguments into a <see cref="ToastArguments"/> object.
+        /// </summary>
+        /// <param name="toastArgumentsStr">The toast arguments string to deserialize.</param>
+        /// <returns>The parsed toast arguments.</returns>
+        public static ToastArguments Parse(string toastArgumentsStr)
+        {
+            if (string.IsNullOrWhiteSpace(toastArgumentsStr))
+            {
+                return new ToastArguments();
+            }
+
+            string[] pairs = toastArgumentsStr.Split('&');
+
+            ToastArguments answer = new ToastArguments();
+
+            foreach (string pair in pairs)
+            {
+                string name;
+                string value;
+
+                int indexOfEquals = pair.IndexOf('=');
+
+                if (indexOfEquals == -1)
+                {
+                    name = UrlDecode(pair);
+                    value = null;
+                }
+                else
+                {
+                    name = UrlDecode(pair.Substring(0, indexOfEquals));
+                    value = UrlDecode(pair.Substring(indexOfEquals + 1));
+                }
+
+                answer.Add(name, value);
+            }
+
+            return answer;
+        }
+
+        /// <summary>
+        /// Serializes the key-value pairs into a string that can be used within a toast notification.
+        /// </summary>
+        /// <returns>A string that can be used within a toast notification.</returns>
+        public sealed override string ToString()
+        {
+            return string.Join("&", this.Select(pair =>
+
+                    // Key
+                    UrlEncode(pair.Key) +
+
+                    // Write value if not null
+                    ((pair.Value == null) ? string.Empty : ("=" + UrlEncode(pair.Value)))));
+        }
+
+        /// <summary>
+        /// Gets an enumerator to enumerate the arguments. Note that order of the arguments is NOT preserved.
+        /// </summary>
+        /// <returns>An enumeartor of the key/value pairs.</returns>
+        public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
+        {
+            return _dictionary.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Gets an enumerator to enumerate the query string parameters.
+        /// </summary>
+        /// <returns>An enumeartor of the key/value pairs.</returns>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
index c4f34406064..6b33964ede2 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
@@ -17,21 +17,103 @@ protected override void OnStartup(StartupEventArgs e)
             // Listen to toast notification activations
             ToastNotificationManagerCompat.OnActivated += this.ToastNotificationManagerCompat_OnActivated;
 
-            if (!ToastNotificationManagerCompat.WasCurrentProcessToastActivated())
+            // If launched from a toast
+            if (ToastNotificationManagerCompat.WasCurrentProcessToastActivated())
             {
+                // Our OnActivated callback will run after this completes,
+                // and will show a window if necessary.
+            }
+            else
+            {
+                // Show the window
+                // In App.xaml, be sure to remove the StartupUri so that a window doesn't
+                // get created by default, since we're creating windows ourselves (and sometimes we
+                // don't want to create a window if handling a background activation).
                 new MainWindow().Show();
             }
         }
 
         private void ToastNotificationManagerCompat_OnActivated(ToastNotificationActivatedEventArgsCompat e)
         {
-            Dispatcher.Invoke(() =>
+            Dispatcher.Invoke(delegate
             {
-                OpenWindowIfNeeded();
+                // If arguments are empty, that means the app title within Action Center was clicked.
+                if (e.Argument.Length == 0)
+                {
+                    OpenWindowIfNeeded();
+                    return;
+                }
+
+                // Parse the toast arguments
+                ToastArguments args = ToastArguments.Parse(e.Argument);
+
+                // See what action is being requested
+                switch (args["action"])
+                {
+                    // Open the image
+                    case "viewImage":
+
+                        // The URL retrieved from the toast args
+                        string imageUrl = args["imageUrl"];
+
+                        // Make sure we have a window open and in foreground
+                        OpenWindowIfNeeded();
+
+                        // And then show the image
+                        (Current.Windows[0] as MainWindow).ShowImage(imageUrl);
+
+                        break;
+
+                    // Open the conversation
+                    case "viewConversation":
+
+                        // The conversation ID retrieved from the toast args
+                        int conversationId = int.Parse(args["conversationId"]);
+
+                        // Make sure we have a window open and in foreground
+                        OpenWindowIfNeeded();
+
+                        // And then show the conversation
+                        (Current.Windows[0] as MainWindow).ShowConversation();
+
+                        break;
+
+                    // Background: Quick reply to the conversation
+                    case "reply":
 
-                var args = e.Argument;
-                var userInputCount = e.UserInput.Count;
-                MessageBox.Show("Activated!");
+                        // Get the response the user typed
+                        string msg = e.UserInput["tbReply"] as string;
+
+                        // And send this message
+                        ShowToast("Message sent: " + msg);
+
+                        // If there's no windows open, exit the app
+                        if (Current.Windows.Count == 0)
+                        {
+                            Current.Shutdown();
+                        }
+
+                        break;
+
+                    // Background: Send a like
+                    case "like":
+
+                        ShowToast("Like sent!");
+
+                        // If there's no windows open, exit the app
+                        if (Current.Windows.Count == 0)
+                        {
+                            Current.Shutdown();
+                        }
+
+                        break;
+
+                    default:
+
+                        OpenWindowIfNeeded();
+
+                        break;
+                }
             });
         }
 
@@ -53,7 +135,15 @@ private void OpenWindowIfNeeded()
         protected override void OnExit(ExitEventArgs e)
         {
             // If your app has an installer, you should call this when your app is uninstalled. Otherwise, if your app is a "portable app" and you no longer need notifications while the app is closed, you can call this upon exit.
-            //ToastNotificationManagerCompat.Uninstall();
+            // ToastNotificationManagerCompat.Uninstall();
+        }
+
+        private void ShowToast(string msg)
+        {
+            // Construct the visuals of the toast and show it!
+            new ToastContentBuilder()
+                .AddText(msg)
+                .Show();
         }
     }
 }
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml
index a86aa2968f1..cf32e0773b6 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml
@@ -8,13 +8,31 @@
         Title="MainWindow" Height="450" Width="800">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="80"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
-        <Button
-            x:Name="ButtonShowToast"
-            Content="Show toast"
-            Click="ButtonShowToast_Click"/>
+        <Grid Margin="20">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Button
+                x:Name="ButtonPopToast"
+                Content="Pop toast"
+                Click="ButtonPopToast_Click"
+                Margin="0,0,6,0"/>
+            <Button
+                Grid.Column="1"
+                x:Name="ButtonClearToasts"
+                Content="Clear toasts"
+                Click="ButtonClearToasts_Click"
+                Margin="6,0,0,0"/>
+        </Grid>
+
+        <ContentControl
+            x:Name="ContentBody"
+            Grid.Row="1"
+            Margin="20"/>
     </Grid>
 </Window>
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
index 638545e7d89..d04380548be 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
@@ -2,7 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media.Imaging;
 using Microsoft.Toolkit.Uwp.Notifications;
 
 namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
@@ -15,13 +21,134 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             InitializeComponent();
+
+            // IMPORTANT: Look at App.xaml.cs for handling toast activation
         }
 
-        private void ButtonShowToast_Click(object sender, RoutedEventArgs e)
+        private async void ButtonPopToast_Click(object sender, RoutedEventArgs e)
         {
+            string title = "Andrew sent you a picture";
+            string content = "Check this out, The Enchantments!";
+            string image = "https://picsum.photos/364/202?image=883";
+            int conversationId = 5;
+
+            // Construct the toast content and show it!
             new ToastContentBuilder()
-                .AddText("Hello from WPF!")
+
+                // Arguments when the user taps body of toast
+                .AddToastActivationInfo(new ToastArguments()
+                {
+                    { "action", "viewConversation" },
+                    { "conversationId", conversationId.ToString() }
+                })
+
+                // Visual content
+                .AddText(title)
+                .AddText(content)
+                .AddInlineImage(new Uri(await DownloadImageToDisk(image)))
+                .AddAppLogoOverride(new Uri(await DownloadImageToDisk("https://unsplash.it/64?image=1005")), ToastGenericAppLogoCrop.Circle)
+
+                // Text box for typing a reply
+                .AddInputTextBox("tbReply", "Type a reply")
+
+                // Buttons
+                .AddButton("Reply", ToastActivationType.Background, new ToastArguments()
+                {
+                    { "action", "reply" },
+                    { "conversationId", conversationId.ToString() }
+                })
+
+                .AddButton("Like", ToastActivationType.Background, new ToastArguments()
+                {
+                    { "action", "like" },
+                    { "conversationId", conversationId.ToString() }
+                })
+
+                .AddButton("View", ToastActivationType.Foreground, new ToastArguments()
+                {
+                    { "action", "viewImage" },
+                    { "imageUrl", image }
+                })
+
+                // And show the toast!
                 .Show();
         }
+
+        private static bool _hasPerformedCleanup;
+
+        private static async Task<string> DownloadImageToDisk(string httpImage)
+        {
+            // Toasts can live for up to 3 days, so we cache images for up to 3 days.
+            // Note that this is a very simple cache that doesn't account for space usage, so
+            // this could easily consume a lot of space within the span of 3 days.
+            try
+            {
+                if (ToastNotificationManagerCompat.CanUseHttpImages)
+                {
+                    return httpImage;
+                }
+
+                var directory = Directory.CreateDirectory(System.IO.Path.GetTempPath() + "WindowsNotifications.DesktopToasts.Images");
+
+                if (!_hasPerformedCleanup)
+                {
+                    // First time we run, we'll perform cleanup of old images
+                    _hasPerformedCleanup = true;
+
+                    foreach (var d in directory.EnumerateDirectories())
+                    {
+                        if (d.CreationTimeUtc.Date < DateTime.UtcNow.Date.AddDays(-3))
+                        {
+                            d.Delete(true);
+                        }
+                    }
+                }
+
+                var dayDirectory = directory.CreateSubdirectory(DateTime.UtcNow.Day.ToString());
+                string imagePath = dayDirectory.FullName + "\\" + (uint)httpImage.GetHashCode();
+
+                if (File.Exists(imagePath))
+                {
+                    return imagePath;
+                }
+
+                HttpClient c = new HttpClient();
+                using (var stream = await c.GetStreamAsync(httpImage))
+                {
+                    using (var fileStream = File.OpenWrite(imagePath))
+                    {
+                        stream.CopyTo(fileStream);
+                    }
+                }
+
+                return imagePath;
+            }
+            catch
+            {
+                return string.Empty;
+            }
+        }
+
+        internal void ShowConversation()
+        {
+            ContentBody.Content = new TextBlock()
+            {
+                Text = "You've just opened a conversation!",
+                FontWeight = FontWeights.Bold
+            };
+        }
+
+        internal void ShowImage(string imageUrl)
+        {
+            ContentBody.Content = new Image()
+            {
+                Source = new BitmapImage(new Uri(imageUrl))
+            };
+        }
+
+        private void ButtonClearToasts_Click(object sender, RoutedEventArgs e)
+        {
+            ToastNotificationManagerCompat.History.Clear();
+        }
     }
 }

From 1e454950eb84dbd24ca5efb17de64d88cb974163 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 29 Oct 2020 08:41:00 -0600
Subject: [PATCH 36/46] NIT fix

---
 Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
index 6b33964ede2..ff744115567 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
@@ -35,7 +35,7 @@ protected override void OnStartup(StartupEventArgs e)
 
         private void ToastNotificationManagerCompat_OnActivated(ToastNotificationActivatedEventArgsCompat e)
         {
-            Dispatcher.Invoke(delegate
+            Dispatcher.Invoke(() =>
             {
                 // If arguments are empty, that means the app title within Action Center was clicked.
                 if (e.Argument.Length == 0)

From bf2139ded2b505181a4b93e760418358ded8d503 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 29 Oct 2020 09:16:35 -0600
Subject: [PATCH 37/46] Added enum and int helpers

---
 .../Toasts/ToastArguments.cs                  | 174 +++++++++++++++++-
 .../App.xaml.cs                               |  89 ++++-----
 .../MainWindow.xaml.cs                        |  24 +--
 .../MyToastActions.cs                         |  29 +++
 4 files changed, 254 insertions(+), 62 deletions(-)
 create mode 100644 Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
index 068f683899b..1013ef1e300 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
@@ -67,6 +66,105 @@ public bool TryGetValue(string key, out string value)
             return _dictionary.TryGetValue(key, out value);
         }
 
+        /// <summary>
+        /// Attempts to get the value of the specified key. If no key exists, returns false.
+        /// </summary>
+        /// <typeparam name="T">The enum to parse.</typeparam>
+        /// <param name="key">The key to find.</param>
+        /// <param name="value">The key's value will be written here if found.</param>
+        /// <returns>True if found the key and set the value, otherwise false.</returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("found")]
+#endif
+        public bool TryGetValue<T>(string key, out T value)
+            where T : struct, Enum
+        {
+            if (TryGetValue(key, out string strValue))
+            {
+                return Enum.TryParse(strValue, out value);
+            }
+
+            value = default(T);
+            return false;
+        }
+
+        /// <summary>
+        /// Gets the value of the specified key, or throws <see cref="KeyNotFoundException"/> if key didn't exist.
+        /// </summary>
+        /// <param name="key">The key to get.</param>
+        /// <returns>The value of the key.</returns>
+        public string Get(string key)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (_dictionary.TryGetValue(key, out string value))
+            {
+                return value;
+            }
+
+            throw new KeyNotFoundException();
+        }
+
+        /// <summary>
+        /// Gets the value of the specified key, or throws <see cref="KeyNotFoundException"/> if key didn't exist.
+        /// </summary>
+        /// <param name="key">The key to get.</param>
+        /// <returns>The value of the key.</returns>
+        public int GetInt(string key)
+        {
+            return int.Parse(Get(key));
+        }
+
+        /// <summary>
+        /// Gets the value of the specified key, or throws <see cref="KeyNotFoundException"/> if key didn't exist.
+        /// </summary>
+        /// <param name="key">The key to get.</param>
+        /// <returns>The value of the key.</returns>
+        public double GetDouble(string key)
+        {
+            return double.Parse(Get(key));
+        }
+
+        /// <summary>
+        /// Gets the value of the specified key, or throws <see cref="KeyNotFoundException"/> if key didn't exist.
+        /// </summary>
+        /// <param name="key">The key to get.</param>
+        /// <returns>The value of the key.</returns>
+        public float GetFloat(string key)
+        {
+            return float.Parse(Get(key));
+        }
+
+        /// <summary>
+        /// Gets the value of the specified key, or throws <see cref="KeyNotFoundException"/> if key didn't exist.
+        /// </summary>
+        /// <param name="key">The key to get.</param>
+        /// <returns>The value of the key.</returns>
+        public bool GetBool(string key)
+        {
+            return Get(key) == "1" ? true : false;
+        }
+
+        /// <summary>
+        /// Gets the value of the specified key, or throws <see cref="KeyNotFoundException"/> if key didn't exist.
+        /// </summary>
+        /// <typeparam name="T">The enum to parse.</typeparam>
+        /// <param name="key">The key to get.</param>
+        /// <returns>The value of the key.</returns>
+        public T GetEnum<T>(string key)
+            where T : struct, Enum
+        {
+            if (TryGetValue(key, out T value))
+            {
+                return value;
+            }
+
+            throw new KeyNotFoundException();
+        }
+
         /// <summary>
         /// Gets the number of key/value pairs contained in the toast arguments.
         /// </summary>
@@ -119,8 +217,9 @@ public void Set(string key)
         /// Sets a key and optional value. If there is an existing key, it is replaced.
         /// </summary>
         /// <param name="key">The key.</param>
-        /// <param name="value">The optional value of the parameter.</param>
-        public void Set(string key, string value)
+        /// <param name="value">The optional value of the key.</param>
+        /// <returns>The current <see cref="ToastArguments"/> object.</returns>
+        public ToastArguments Set(string key, string value)
         {
             if (key == null)
             {
@@ -128,6 +227,75 @@ public void Set(string key, string value)
             }
 
             _dictionary[key] = value;
+
+            return this;
+        }
+
+        /// <summary>
+        /// Sets a key and value. If there is an existing key, it is replaced.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value of the key.</param>
+        /// <returns>The current <see cref="ToastArguments"/> object.</returns>
+        public ToastArguments Set(string key, int value)
+        {
+            return SetHelper(key, value);
+        }
+
+        /// <summary>
+        /// Sets a key and value. If there is an existing key, it is replaced.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value of the key.</param>
+        /// <returns>The current <see cref="ToastArguments"/> object.</returns>
+        public ToastArguments Set(string key, double value)
+        {
+            return SetHelper(key, value);
+        }
+
+        /// <summary>
+        /// Sets a key and value. If there is an existing key, it is replaced.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value of the key.</param>
+        /// <returns>The current <see cref="ToastArguments"/> object.</returns>
+        public ToastArguments Set(string key, float value)
+        {
+            return SetHelper(key, value);
+        }
+
+        /// <summary>
+        /// Sets a key and value. If there is an existing key, it is replaced.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value of the key.</param>
+        /// <returns>The current <see cref="ToastArguments"/> object.</returns>
+        public ToastArguments Set(string key, bool value)
+        {
+            return Set(key, value ? "1" : "0"); // Encode as 1 or 0 to save string space
+        }
+
+        /// <summary>
+        /// Sets a key and value. If there is an existing key, it is replaced.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value of the key. Note that the enums are stored using their numeric value, so be aware that changing your enum number values might break existing activation of toasts currently in Action Center.</param>
+        /// <returns>The current <see cref="ToastArguments"/> object.</returns>
+        public ToastArguments Set(string key, Enum value)
+        {
+            return Set(key, (int)(object)value);
+        }
+
+        private ToastArguments SetHelper(string key, object value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            _dictionary[key] = value.ToString();
+
+            return this;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
index ff744115567..6e587b53bf2 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
@@ -48,71 +48,74 @@ private void ToastNotificationManagerCompat_OnActivated(ToastNotificationActivat
                 ToastArguments args = ToastArguments.Parse(e.Argument);
 
                 // See what action is being requested
-                switch (args["action"])
+                if (args.TryGetValue("action", out MyToastActions action))
                 {
-                    // Open the image
-                    case "viewImage":
+                    switch (action)
+                    {
+                        // Open the image
+                        case MyToastActions.ViewImage:
 
-                        // The URL retrieved from the toast args
-                        string imageUrl = args["imageUrl"];
+                            // The URL retrieved from the toast args
+                            string imageUrl = args["imageUrl"];
 
-                        // Make sure we have a window open and in foreground
-                        OpenWindowIfNeeded();
+                            // Make sure we have a window open and in foreground
+                            OpenWindowIfNeeded();
 
-                        // And then show the image
-                        (Current.Windows[0] as MainWindow).ShowImage(imageUrl);
+                            // And then show the image
+                            (Current.Windows[0] as MainWindow).ShowImage(imageUrl);
 
-                        break;
+                            break;
 
-                    // Open the conversation
-                    case "viewConversation":
+                        // Open the conversation
+                        case MyToastActions.ViewConversation:
 
-                        // The conversation ID retrieved from the toast args
-                        int conversationId = int.Parse(args["conversationId"]);
+                            // The conversation ID retrieved from the toast args
+                            int conversationId = args.GetInt("conversationId");
 
-                        // Make sure we have a window open and in foreground
-                        OpenWindowIfNeeded();
+                            // Make sure we have a window open and in foreground
+                            OpenWindowIfNeeded();
 
-                        // And then show the conversation
-                        (Current.Windows[0] as MainWindow).ShowConversation();
+                            // And then show the conversation
+                            (Current.Windows[0] as MainWindow).ShowConversation();
 
-                        break;
+                            break;
 
-                    // Background: Quick reply to the conversation
-                    case "reply":
+                        // Background: Quick reply to the conversation
+                        case MyToastActions.Reply:
 
-                        // Get the response the user typed
-                        string msg = e.UserInput["tbReply"] as string;
+                            // Get the response the user typed
+                            string msg = e.UserInput["tbReply"] as string;
 
-                        // And send this message
-                        ShowToast("Message sent: " + msg);
+                            // And send this message
+                            ShowToast("Message sent: " + msg);
 
-                        // If there's no windows open, exit the app
-                        if (Current.Windows.Count == 0)
-                        {
-                            Current.Shutdown();
-                        }
+                            // If there's no windows open, exit the app
+                            if (Current.Windows.Count == 0)
+                            {
+                                Current.Shutdown();
+                            }
 
-                        break;
+                            break;
 
-                    // Background: Send a like
-                    case "like":
+                        // Background: Send a like
+                        case MyToastActions.Like:
 
-                        ShowToast("Like sent!");
+                            ShowToast("Like sent!");
 
-                        // If there's no windows open, exit the app
-                        if (Current.Windows.Count == 0)
-                        {
-                            Current.Shutdown();
-                        }
+                            // If there's no windows open, exit the app
+                            if (Current.Windows.Count == 0)
+                            {
+                                Current.Shutdown();
+                            }
 
-                        break;
+                            break;
 
-                    default:
+                        default:
 
-                        OpenWindowIfNeeded();
+                            OpenWindowIfNeeded();
 
-                        break;
+                            break;
+                    }
                 }
             });
         }
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
index d04380548be..84cb107ffdb 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
@@ -37,10 +37,8 @@ private async void ButtonPopToast_Click(object sender, RoutedEventArgs e)
 
                 // Arguments when the user taps body of toast
                 .AddToastActivationInfo(new ToastArguments()
-                {
-                    { "action", "viewConversation" },
-                    { "conversationId", conversationId.ToString() }
-                })
+                    .Set("action", MyToastActions.ViewConversation)
+                    .Set("conversationId", conversationId))
 
                 // Visual content
                 .AddText(title)
@@ -53,22 +51,16 @@ private async void ButtonPopToast_Click(object sender, RoutedEventArgs e)
 
                 // Buttons
                 .AddButton("Reply", ToastActivationType.Background, new ToastArguments()
-                {
-                    { "action", "reply" },
-                    { "conversationId", conversationId.ToString() }
-                })
+                    .Set("action", MyToastActions.Reply)
+                    .Set("conversationId", conversationId))
 
                 .AddButton("Like", ToastActivationType.Background, new ToastArguments()
-                {
-                    { "action", "like" },
-                    { "conversationId", conversationId.ToString() }
-                })
+                    .Set("action", MyToastActions.Like)
+                    .Set("conversationId", conversationId))
 
                 .AddButton("View", ToastActivationType.Foreground, new ToastArguments()
-                {
-                    { "action", "viewImage" },
-                    { "imageUrl", image }
-                })
+                    .Set("action", MyToastActions.ViewImage)
+                    .Set("imageUrl", image))
 
                 // And show the toast!
                 .Show();
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs
new file mode 100644
index 00000000000..dd93d2d1865
--- /dev/null
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
+{
+    public enum MyToastActions
+    {
+        /// <summary>
+        /// View the conversation
+        /// </summary>
+        ViewConversation,
+
+        /// <summary>
+        /// Inline reply to a message
+        /// </summary>
+        Reply,
+
+        /// <summary>
+        /// Like a message
+        /// </summary>
+        Like,
+
+        /// <summary>
+        /// View the image included in the message
+        /// </summary>
+        ViewImage
+    }
+}

From 634478df8720e80cb7274cbf4de4bc01c3507cbd Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 30 Oct 2020 10:13:31 -0600
Subject: [PATCH 38/46] Tests and fixes for ToastArguments

---
 .../Toasts/ToastArguments.cs                  |  77 ++-
 .../TestToastArguments.cs                     | 506 ++++++++++++++++++
 .../TestToastContentBuilder.cs                |  88 +++
 .../UnitTests.Notifications.Shared.projitems  |   1 +
 4 files changed, 652 insertions(+), 20 deletions(-)
 create mode 100644 UnitTests/UnitTests.Notifications.Shared/TestToastArguments.cs

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
index 1013ef1e300..fb61aea283a 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
@@ -6,7 +6,7 @@
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
     /// <summary>
-    /// A portable string serializer/deserializer for .NET.
+    /// A class that supports serializing simple key/value pairs into a format that's friendly for being used within toast notifications. The serialized format is similar to a query string, however optimized for being placed within an XML property (uses semicolons instead of ampersands since those don't need to be XML-escaped, doesn't url-encode all special characters since not being used within a URL, etc).
     /// </summary>
     public sealed class ToastArguments : IEnumerable<KeyValuePair<string, string>>
     {
@@ -66,6 +66,7 @@ public bool TryGetValue(string key, out string value)
             return _dictionary.TryGetValue(key, out value);
         }
 
+#if !WINRT
         /// <summary>
         /// Attempts to get the value of the specified key. If no key exists, returns false.
         /// </summary>
@@ -73,9 +74,6 @@ public bool TryGetValue(string key, out string value)
         /// <param name="key">The key to find.</param>
         /// <param name="value">The key's value will be written here if found.</param>
         /// <returns>True if found the key and set the value, otherwise false.</returns>
-#if WINRT
-        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("found")]
-#endif
         public bool TryGetValue<T>(string key, out T value)
             where T : struct, Enum
         {
@@ -87,6 +85,7 @@ public bool TryGetValue<T>(string key, out T value)
             value = default(T);
             return false;
         }
+#endif
 
         /// <summary>
         /// Gets the value of the specified key, or throws <see cref="KeyNotFoundException"/> if key didn't exist.
@@ -138,6 +137,16 @@ public float GetFloat(string key)
             return float.Parse(Get(key));
         }
 
+        /// <summary>
+        /// Gets the value of the specified key, or throws <see cref="KeyNotFoundException"/> if key didn't exist.
+        /// </summary>
+        /// <param name="key">The key to get.</param>
+        /// <returns>The value of the key.</returns>
+        public byte GetByte(string key)
+        {
+            return byte.Parse(Get(key));
+        }
+
         /// <summary>
         /// Gets the value of the specified key, or throws <see cref="KeyNotFoundException"/> if key didn't exist.
         /// </summary>
@@ -148,6 +157,7 @@ public bool GetBool(string key)
             return Get(key) == "1" ? true : false;
         }
 
+#if !WINRT
         /// <summary>
         /// Gets the value of the specified key, or throws <see cref="KeyNotFoundException"/> if key didn't exist.
         /// </summary>
@@ -164,6 +174,7 @@ public T GetEnum<T>(string key)
 
             throw new KeyNotFoundException();
         }
+#endif
 
         /// <summary>
         /// Gets the number of key/value pairs contained in the toast arguments.
@@ -203,7 +214,11 @@ public void Add(string key, string value)
         /// Sets a key. If there is an existing key, it is replaced.
         /// </summary>
         /// <param name="key">The key.</param>
-        public void Set(string key)
+        /// <returns>The current <see cref="ToastArguments"/> object.</returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastArguments")]
+#endif
+        public ToastArguments Set(string key)
         {
             if (key == null)
             {
@@ -211,6 +226,8 @@ public void Set(string key)
             }
 
             _dictionary[key] = null;
+
+            return this;
         }
 
         /// <summary>
@@ -219,6 +236,10 @@ public void Set(string key)
         /// <param name="key">The key.</param>
         /// <param name="value">The optional value of the key.</param>
         /// <returns>The current <see cref="ToastArguments"/> object.</returns>
+#if WINRT
+        [Windows.Foundation.Metadata.DefaultOverload]
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastArguments")]
+#endif
         public ToastArguments Set(string key, string value)
         {
             if (key == null)
@@ -237,6 +258,9 @@ public ToastArguments Set(string key, string value)
         /// <param name="key">The key.</param>
         /// <param name="value">The value of the key.</param>
         /// <returns>The current <see cref="ToastArguments"/> object.</returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastArguments")]
+#endif
         public ToastArguments Set(string key, int value)
         {
             return SetHelper(key, value);
@@ -248,6 +272,9 @@ public ToastArguments Set(string key, int value)
         /// <param name="key">The key.</param>
         /// <param name="value">The value of the key.</param>
         /// <returns>The current <see cref="ToastArguments"/> object.</returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastArguments")]
+#endif
         public ToastArguments Set(string key, double value)
         {
             return SetHelper(key, value);
@@ -259,6 +286,9 @@ public ToastArguments Set(string key, double value)
         /// <param name="key">The key.</param>
         /// <param name="value">The value of the key.</param>
         /// <returns>The current <see cref="ToastArguments"/> object.</returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastArguments")]
+#endif
         public ToastArguments Set(string key, float value)
         {
             return SetHelper(key, value);
@@ -270,11 +300,15 @@ public ToastArguments Set(string key, float value)
         /// <param name="key">The key.</param>
         /// <param name="value">The value of the key.</param>
         /// <returns>The current <see cref="ToastArguments"/> object.</returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastArguments")]
+#endif
         public ToastArguments Set(string key, bool value)
         {
             return Set(key, value ? "1" : "0"); // Encode as 1 or 0 to save string space
         }
 
+#if !WINRT
         /// <summary>
         /// Sets a key and value. If there is an existing key, it is replaced.
         /// </summary>
@@ -285,6 +319,7 @@ public ToastArguments Set(string key, Enum value)
         {
             return Set(key, (int)(object)value);
         }
+#endif
 
         private ToastArguments SetHelper(string key, object value)
         {
@@ -347,18 +382,20 @@ public bool Remove(string key)
             return _dictionary.Remove(key);
         }
 
-        private static string UrlEncode(string str)
+        private static string Encode(string str)
         {
-            return Uri.EscapeDataString(str)
-
-                // It incorrectly encodes spaces as %20, should use +
-                .Replace("%20", "+");
+            return str
+                .Replace("%", "%25")
+                .Replace(";", "%3B")
+                .Replace("=", "%3D");
         }
 
-        private static string UrlDecode(string str)
+        private static string Decode(string str)
         {
-            // Doesn't handle decoding the +, so we manually do that
-            return Uri.UnescapeDataString(str.Replace('+', ' '));
+            return str
+                .Replace("%25", "%")
+                .Replace("%3B", ";")
+                .Replace("%3D", "=");
         }
 
         /// <summary>
@@ -373,7 +410,7 @@ public static ToastArguments Parse(string toastArgumentsStr)
                 return new ToastArguments();
             }
 
-            string[] pairs = toastArgumentsStr.Split('&');
+            string[] pairs = toastArgumentsStr.Split(';');
 
             ToastArguments answer = new ToastArguments();
 
@@ -386,13 +423,13 @@ public static ToastArguments Parse(string toastArgumentsStr)
 
                 if (indexOfEquals == -1)
                 {
-                    name = UrlDecode(pair);
+                    name = Decode(pair);
                     value = null;
                 }
                 else
                 {
-                    name = UrlDecode(pair.Substring(0, indexOfEquals));
-                    value = UrlDecode(pair.Substring(indexOfEquals + 1));
+                    name = Decode(pair.Substring(0, indexOfEquals));
+                    value = Decode(pair.Substring(indexOfEquals + 1));
                 }
 
                 answer.Add(name, value);
@@ -407,13 +444,13 @@ public static ToastArguments Parse(string toastArgumentsStr)
         /// <returns>A string that can be used within a toast notification.</returns>
         public sealed override string ToString()
         {
-            return string.Join("&", this.Select(pair =>
+            return string.Join(";", this.Select(pair =>
 
                     // Key
-                    UrlEncode(pair.Key) +
+                    Encode(pair.Key) +
 
                     // Write value if not null
-                    ((pair.Value == null) ? string.Empty : ("=" + UrlEncode(pair.Value)))));
+                    ((pair.Value == null) ? string.Empty : ("=" + Encode(pair.Value)))));
         }
 
         /// <summary>
diff --git a/UnitTests/UnitTests.Notifications.Shared/TestToastArguments.cs b/UnitTests/UnitTests.Notifications.Shared/TestToastArguments.cs
new file mode 100644
index 00000000000..7f170cf3ada
--- /dev/null
+++ b/UnitTests/UnitTests.Notifications.Shared/TestToastArguments.cs
@@ -0,0 +1,506 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.Toolkit.Uwp.Notifications;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace UnitTests.Notifications
+{
+    [TestClass]
+    public class TestToastArguments
+    {
+        [TestMethod]
+        public void TestAddExceptions_NullName()
+        {
+            ToastArguments query = new ToastArguments();
+
+            try
+            {
+                query.Add(null, "value");
+            }
+            catch (ArgumentNullException)
+            {
+                return;
+            }
+
+            Assert.Fail("Adding null name shouldn't be allowed.");
+        }
+
+        [TestMethod]
+        public void TestParsing()
+        {
+            AssertParse(new ToastArguments(), string.Empty);
+            AssertParse(new ToastArguments(), "   ");
+            AssertParse(new ToastArguments(), "\n");
+            AssertParse(new ToastArguments(), "\t \n");
+            AssertParse(new ToastArguments(), null);
+
+            AssertParse(
+                new ToastArguments()
+                {
+                    { "isBook" }
+                }, "isBook");
+
+            AssertParse(
+                new ToastArguments()
+                {
+                    { "isBook" },
+                    { "isRead" }
+                }, "isBook;isRead");
+
+            AssertParse(
+                new ToastArguments()
+                {
+                    { "isBook" },
+                    { "isRead" },
+                    { "isLiked" }
+                }, "isBook;isRead;isLiked");
+
+            AssertParse(
+                new ToastArguments()
+                {
+                    { "name", "Andrew" }
+                }, "name=Andrew");
+
+            AssertParse(
+                new ToastArguments()
+                {
+                    { "name", "Andrew" },
+                    { "isAdult" }
+                }, "name=Andrew;isAdult");
+
+            AssertParse(
+                new ToastArguments()
+                {
+                    { "name", "Andrew" },
+                    { "isAdult" }
+                }, "isAdult;name=Andrew");
+
+            AssertParse(
+                new ToastArguments()
+                {
+                    { "name", "Andrew" },
+                    { "age", "22" }
+                }, "age=22;name=Andrew");
+        }
+
+        [TestMethod]
+        public void TestToString_ExactString()
+        {
+            Assert.AreEqual(string.Empty, new ToastArguments().ToString());
+
+            Assert.AreEqual("isBook", new ToastArguments()
+            {
+                { "isBook" }
+            }.ToString());
+
+            Assert.AreEqual("name=Andrew", new ToastArguments()
+            {
+                { "name", "Andrew" }
+            }.ToString());
+        }
+
+        [TestMethod]
+        public void TestSpecialCharacters()
+        {
+            Assert.AreEqual("full name=Andrew Leader", new ToastArguments()
+            {
+                { "full name", "Andrew Leader" }
+            }.ToString());
+
+            Assert.AreEqual("name%3Bcompany=Andrew%3BMicrosoft", new ToastArguments()
+            {
+                { "name;company", "Andrew;Microsoft" }
+            }.ToString());
+
+            Assert.AreEqual("name/company=Andrew/Microsoft", new ToastArguments()
+            {
+                { "name/company", "Andrew/Microsoft" }
+            }.ToString());
+
+            Assert.AreEqual("message=Dinner?", new ToastArguments()
+            {
+                { "message", "Dinner?" }
+            }.ToString());
+
+            Assert.AreEqual("message=to: Andrew", new ToastArguments()
+            {
+                { "message", "to: Andrew" }
+            }.ToString());
+
+            Assert.AreEqual("email=andrew@live.com", new ToastArguments()
+            {
+                { "email", "andrew@live.com" }
+            }.ToString());
+
+            Assert.AreEqual("messsage=food%3Dyummy", new ToastArguments()
+            {
+                { "messsage", "food=yummy" }
+            }.ToString());
+
+            Assert.AreEqual("messsage=$$$", new ToastArguments()
+            {
+                { "messsage", "$$$" }
+            }.ToString());
+
+            Assert.AreEqual("messsage=-_.!~*'()", new ToastArguments()
+            {
+                { "messsage", "-_.!~*'()" }
+            }.ToString());
+
+            Assert.AreEqual("messsage=this & that", new ToastArguments()
+            {
+                { "messsage", "this & that" }
+            }.ToString());
+
+            Assert.AreEqual("messsage=20%25 off!", new ToastArguments()
+            {
+                { "messsage", "20% off!" }
+            }.ToString());
+
+            Assert.AreEqual("messsage=Nonsense %2526 %2525 %253D", new ToastArguments()
+            {
+                { "messsage", "Nonsense %26 %25 %3D" }
+            }.ToString());
+        }
+
+        [TestMethod]
+        public void TestDecoding()
+        {
+            AssertDecode("Hello world", "Hello world");
+
+            AssertDecode(";/?:@&=+$%", "%3B/?:@&%3D+$%25");
+            AssertDecode("-_.!~*'()", "-_.!~*'()");
+        }
+
+#if !WINRT
+        [TestMethod]
+        public void TestIndexer_NullException()
+        {
+            try
+            {
+                string val = new ToastArguments()[null];
+            }
+            catch (ArgumentNullException)
+            {
+                return;
+            }
+
+            Assert.Fail("Exception should have been thrown.");
+        }
+
+        [TestMethod]
+        public void TestIndexer_NotFoundException()
+        {
+            try
+            {
+                var args = new ToastArguments()
+                {
+                    { "name", "Andrew" }
+                };
+
+                _ = args["Name"];
+            }
+            catch (KeyNotFoundException)
+            {
+                return;
+            }
+
+            Assert.Fail("Exception should have been thrown.");
+        }
+
+        [TestMethod]
+        public void TestIndexer()
+        {
+            AssertIndexer(null, "isBook;name=Andrew", "isBook");
+
+            AssertIndexer("Andrew", "isBook;name=Andrew", "name");
+
+            AssertIndexer("Andrew", "count=2;name=Andrew", "name");
+        }
+#endif
+
+        [TestMethod]
+        public void TestRemove_OnlyKey()
+        {
+            ToastArguments qs = new ToastArguments()
+            {
+                { "name", "Andrew" },
+                { "age", "22" }
+            };
+
+            Assert.IsTrue(qs.Remove("age"));
+
+            AssertEqual(
+                new ToastArguments()
+                {
+                    { "name", "Andrew" }
+                }, qs);
+
+            Assert.IsFalse(qs.Remove("age"));
+        }
+
+        [TestMethod]
+        public void TestContains()
+        {
+            ToastArguments qs = new ToastArguments();
+
+            Assert.IsFalse(qs.Contains("name"));
+            Assert.IsFalse(qs.Contains("name", "Andrew"));
+
+            qs.Add("isBook");
+
+            Assert.IsFalse(qs.Contains("name"));
+            Assert.IsFalse(qs.Contains("name", "Andrew"));
+
+            Assert.IsTrue(qs.Contains("isBook"));
+            Assert.IsTrue(qs.Contains("isBook", null));
+            Assert.IsFalse(qs.Contains("isBook", "True"));
+
+            qs.Set("isBook", "True");
+
+            Assert.IsTrue(qs.Contains("isBook"));
+            Assert.IsFalse(qs.Contains("isBook", null));
+            Assert.IsTrue(qs.Contains("isBook", "True"));
+
+            qs.Add("name", "Andrew");
+
+            Assert.IsTrue(qs.Contains("name"));
+            Assert.IsFalse(qs.Contains("name", null)); // Value doesn't exist
+            Assert.IsTrue(qs.Contains("name", "Andrew"));
+            Assert.IsFalse(qs.Contains("Name", "Andrew")); // Wrong case on name
+            Assert.IsFalse(qs.Contains("name", "andrew")); // Wrong case on value
+            Assert.IsFalse(qs.Contains("Name")); // Wrong case on name
+        }
+
+        [TestMethod]
+        public void TestSet()
+        {
+            ToastArguments qs = new ToastArguments();
+
+            qs.Set("name", "Andrew");
+
+            AssertEqual(
+                new ToastArguments()
+                {
+                    { "name", "Andrew" }
+                }, qs);
+
+            qs.Set("age", "22");
+
+            AssertEqual(
+                new ToastArguments()
+                {
+                    { "name", "Andrew" },
+                    { "age", "22" }
+                }, qs);
+
+            qs.Set("name", "Lei");
+
+            AssertEqual(
+                new ToastArguments()
+                {
+                    { "name", "Lei" },
+                    { "age", "22" }
+                }, qs);
+
+            string nullStr = null;
+            qs.Set("name", nullStr);
+
+            AssertEqual(
+                new ToastArguments()
+                {
+                    { "name" },
+                    { "age", "22" }
+                }, qs);
+        }
+
+        [TestMethod]
+        public void TestEnumerator()
+        {
+            KeyValuePair<string, string>[] parameters = ToastArguments.Parse("name=Andrew;age=22;isOld").ToArray();
+
+            Assert.AreEqual(3, parameters.Length);
+            Assert.AreEqual(1, parameters.Count(i => i.Key.Equals("name")));
+            Assert.AreEqual(1, parameters.Count(i => i.Key.Equals("age")));
+            Assert.AreEqual(1, parameters.Count(i => i.Key.Equals("isOld")));
+            Assert.IsTrue(parameters.Any(i => i.Key.Equals("name") && i.Value.Equals("Andrew")));
+            Assert.IsTrue(parameters.Any(i => i.Key.Equals("age") && i.Value.Equals("22")));
+            Assert.IsTrue(parameters.Any(i => i.Key.Equals("isOld") && i.Value == null));
+        }
+
+        [TestMethod]
+        public void TestCount()
+        {
+            ToastArguments qs = new ToastArguments();
+
+            Assert.AreEqual(0, qs.Count);
+
+            qs.Add("name", "Andrew");
+
+            Assert.AreEqual(1, qs.Count);
+
+            qs.Add("age", "22");
+
+            Assert.AreEqual(2, qs.Count);
+
+            qs.Remove("age");
+
+            Assert.AreEqual(1, qs.Count);
+
+            qs.Remove("name");
+
+            Assert.AreEqual(0, qs.Count);
+        }
+
+        [TestMethod]
+        public void TestStronglyTyped()
+        {
+            ToastArguments args = new ToastArguments()
+                .Set("isAdult", true)
+                .Set("isPremium", false)
+                .Set("age", 22)
+                .Set("level", 0)
+                .Set("gpa", 3.97)
+                .Set("percent", 97.3f);
+
+#if !WINRT
+            args.Set("activationKind", ToastActivationType.Background);
+#endif
+
+            AssertEqual(
+                new ToastArguments()
+                {
+                    { "isAdult", "1" },
+                    { "isPremium", "0" },
+                    { "age", "22" },
+                    { "level", "0" },
+                    { "gpa", "3.97" },
+                    { "percent", "97.3" },
+#if !WINRT
+                    { "activationKind", "1" }
+#endif
+                }, args);
+
+            Assert.AreEqual(true, args.GetBool("isAdult"));
+            Assert.AreEqual("1", args.Get("isAdult"));
+
+            Assert.AreEqual(false, args.GetBool("isPremium"));
+            Assert.AreEqual("0", args.Get("isPremium"));
+
+            Assert.AreEqual(22, args.GetInt("age"));
+            Assert.AreEqual(22d, args.GetDouble("age"));
+            Assert.AreEqual(22f, args.GetFloat("age"));
+            Assert.AreEqual("22", args.Get("age"));
+
+            Assert.AreEqual(0, args.GetInt("level"));
+
+            Assert.AreEqual(3.97d, args.GetDouble("gpa"));
+
+            Assert.AreEqual(97.3f, args.GetFloat("percent"));
+
+#if !WINRT
+            Assert.AreEqual(ToastActivationType.Background, args.GetEnum<ToastActivationType>("activationKind"));
+
+            if (args.TryGetValue("activationKind", out ToastActivationType activationType))
+            {
+                Assert.AreEqual(ToastActivationType.Background, activationType);
+            }
+            else
+            {
+                Assert.Fail("TryGetValue as enum failed");
+            }
+
+            // Trying to get enum that isn't an enum should return false
+            Assert.IsFalse(args.TryGetValue("percent", out activationType));
+#endif
+
+            // After serializing and deserializing, the same should work
+            args = ToastArguments.Parse(args.ToString());
+
+            Assert.AreEqual(true, args.GetBool("isAdult"));
+            Assert.AreEqual("1", args.Get("isAdult"));
+
+            Assert.AreEqual(false, args.GetBool("isPremium"));
+            Assert.AreEqual("0", args.Get("isPremium"));
+
+            Assert.AreEqual(22, args.GetInt("age"));
+            Assert.AreEqual(22d, args.GetDouble("age"));
+            Assert.AreEqual(22f, args.GetFloat("age"));
+            Assert.AreEqual("22", args.Get("age"));
+
+            Assert.AreEqual(0, args.GetInt("level"));
+
+            Assert.AreEqual(3.97d, args.GetDouble("gpa"));
+
+            Assert.AreEqual(97.3f, args.GetFloat("percent"));
+
+#if !WINRT
+            Assert.AreEqual(ToastActivationType.Background, args.GetEnum<ToastActivationType>("activationKind"));
+
+            if (args.TryGetValue("activationKind", out activationType))
+            {
+                Assert.AreEqual(ToastActivationType.Background, activationType);
+            }
+            else
+            {
+                Assert.Fail("TryGetValue as enum failed");
+            }
+
+            // Trying to get enum that isn't an enum should return false
+            Assert.IsFalse(args.TryGetValue("percent", out activationType));
+#endif
+        }
+
+#if !WINRT
+        private static void AssertIndexer(string expected, string queryString, string paramName)
+        {
+            ToastArguments q = ToastArguments.Parse(queryString);
+
+            Assert.AreEqual(expected, q[paramName]);
+        }
+#endif
+
+        private static void AssertDecode(string expected, string encoded)
+        {
+            Assert.AreEqual(expected, ToastArguments.Parse("message=" + encoded).Get("message"));
+        }
+
+        private static void AssertParse(ToastArguments expected, string inputQueryString)
+        {
+            Assert.IsTrue(IsSame(expected, ToastArguments.Parse(inputQueryString)), "Expected: " + expected + "\nActual: " + inputQueryString);
+        }
+
+        private static void AssertEqual(ToastArguments expected, ToastArguments actual)
+        {
+            Assert.IsTrue(IsSame(expected, actual), "Expected: " + expected + "\nActual: " + actual);
+
+            Assert.IsTrue(IsSame(expected, ToastArguments.Parse(actual.ToString())), "After serializing and parsing actual, result changed.\n\nExpected: " + expected + "\nActual: " + ToastArguments.Parse(actual.ToString()));
+            Assert.IsTrue(IsSame(ToastArguments.Parse(expected.ToString()), actual), "After serializing and parsing expected, result changed.\n\nExpected: " + ToastArguments.Parse(expected.ToString()) + "\nActual: " + actual);
+            Assert.IsTrue(IsSame(ToastArguments.Parse(expected.ToString()), ToastArguments.Parse(actual.ToString())), "After serializing and parsing both, result changed.\n\nExpected: " + ToastArguments.Parse(expected.ToString()) + "\nActual: " + ToastArguments.Parse(actual.ToString()));
+        }
+
+        private static bool IsSame(ToastArguments expected, ToastArguments actual)
+        {
+            if (expected.Count != actual.Count)
+            {
+                return false;
+            }
+
+            foreach (var pair in expected)
+            {
+                if (!actual.Contains(pair.Key))
+                {
+                    return false;
+                }
+
+                if (actual.Get(pair.Key) != pair.Value)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs b/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
index 16c66aefe1c..89d55e4060f 100644
--- a/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
+++ b/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
@@ -80,6 +80,23 @@ public void AddToastActivationInfoDefaultTest_WithExpectedArgs_ReturnSelfWithAct
             Assert.AreEqual(ToastActivationType.Foreground, builder.Content.ActivationType);
         }
 
+        [TestMethod]
+        public void AddToastActivationInfoTest_WithExpectedArgs_UsingToastArguments()
+        {
+            // Arrange
+            ToastArguments args = new ToastArguments().Set("name", "Andrew");
+            ToastActivationType testToastActivationType = ToastActivationType.Background;
+
+            // Act
+            ToastContentBuilder builder = new ToastContentBuilder();
+            ToastContentBuilder anotherReference = builder.AddToastActivationInfo(args, testToastActivationType);
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+            Assert.AreEqual(args.ToString(), builder.Content.Launch);
+            Assert.AreEqual(testToastActivationType, builder.Content.ActivationType);
+        }
+
         [TestMethod]
         public void SetToastDurationTest_WithCustomToastDuration_ReturnSelfWithCustomToastDurationSet()
         {
@@ -545,6 +562,27 @@ public void AddButtonTest_WithTextOnlyButton_ReturnSelfWithButtonAdded()
             Assert.AreEqual(testButtonLaunchArgs, button.Arguments);
         }
 
+        [TestMethod]
+        public void AddButtonTest_WithTextOnlyButtonAndToastArguments_ReturnSelfWithButtonAdded()
+        {
+            // Arrange
+            string testButtonContent = "Test Button Content";
+            ToastActivationType testToastActivationType = ToastActivationType.Background;
+            var testButtonLaunchArgs = new ToastArguments().Set("action", "view");
+            ToastContentBuilder builder = new ToastContentBuilder();
+
+            // Act
+            ToastContentBuilder anotherReference = builder.AddButton(testButtonContent, testToastActivationType, testButtonLaunchArgs);
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+
+            var button = (builder.Content.Actions as ToastActionsCustom).Buttons.First() as ToastButton;
+            Assert.AreEqual(testButtonContent, button.Content);
+            Assert.AreEqual(testToastActivationType, button.ActivationType);
+            Assert.AreEqual(testButtonLaunchArgs.ToString(), button.Arguments);
+        }
+
         [TestMethod]
         public void AddButtonTest_WithCustomImageAndTextButton_ReturnSelfWithButtonAdded()
         {
@@ -569,6 +607,30 @@ public void AddButtonTest_WithCustomImageAndTextButton_ReturnSelfWithButtonAdded
             Assert.AreEqual(testImageUriSrc.OriginalString, button.ImageUri);
         }
 
+        [TestMethod]
+        public void AddButtonTest_WithCustomImageAndTextButtonAndToastArguments_ReturnSelfWithButtonAdded()
+        {
+            // Arrange
+            string testButtonContent = "Test Button Content";
+            ToastActivationType testToastActivationType = ToastActivationType.Background;
+            var testButtonLaunchArgs = new ToastArguments().Set("action", "accept");
+            Uri testImageUriSrc = new Uri("C:/justatesturi.jpg");
+
+            ToastContentBuilder builder = new ToastContentBuilder();
+
+            // Act
+            ToastContentBuilder anotherReference = builder.AddButton(testButtonContent, testToastActivationType, testButtonLaunchArgs, testImageUriSrc);
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+
+            var button = (builder.Content.Actions as ToastActionsCustom).Buttons.First() as ToastButton;
+            Assert.AreEqual(testButtonContent, button.Content);
+            Assert.AreEqual(testToastActivationType, button.ActivationType);
+            Assert.AreEqual(testButtonLaunchArgs.ToString(), button.Arguments);
+            Assert.AreEqual(testImageUriSrc.OriginalString, button.ImageUri);
+        }
+
         [TestMethod]
         public void AddButtonTest_WithTextBoxId_ReturnSelfWithButtonAdded()
         {
@@ -595,6 +657,32 @@ public void AddButtonTest_WithTextBoxId_ReturnSelfWithButtonAdded()
             Assert.AreEqual(testImageUriSrc.OriginalString, button.ImageUri);
         }
 
+        [TestMethod]
+        public void AddButtonTest_WithTextBoxIdAndToastArguments_ReturnSelfWithButtonAdded()
+        {
+            // Arrange
+            string testInputTextBoxId = Guid.NewGuid().ToString();
+            string testButtonContent = "Test Button Content";
+            ToastActivationType testToastActivationType = ToastActivationType.Background;
+            var testButtonLaunchArgs = new ToastArguments().Set("action", "send");
+            Uri testImageUriSrc = new Uri("C:/justatesturi.jpg");
+
+            ToastContentBuilder builder = new ToastContentBuilder();
+
+            // Act
+            ToastContentBuilder anotherReference = builder.AddButton(testInputTextBoxId, testButtonContent, testToastActivationType, testButtonLaunchArgs, testImageUriSrc);
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+
+            var button = (builder.Content.Actions as ToastActionsCustom).Buttons.First() as ToastButton;
+            Assert.AreEqual(testInputTextBoxId, button.TextBoxId);
+            Assert.AreEqual(testButtonContent, button.Content);
+            Assert.AreEqual(testToastActivationType, button.ActivationType);
+            Assert.AreEqual(testButtonLaunchArgs.ToString(), button.Arguments);
+            Assert.AreEqual(testImageUriSrc.OriginalString, button.ImageUri);
+        }
+
         [TestMethod]
         public void AddInputTextBoxTest_WithStringIdOnly_ReturnSelfWithInputTextBoxAdded()
         {
diff --git a/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.projitems b/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.projitems
index cb3dc791458..e3eda81fc0e 100644
--- a/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.projitems
+++ b/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.projitems
@@ -11,6 +11,7 @@
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)TestAssertHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)TestMail.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TestToastArguments.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)TestToastContentBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)TestWeather.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Test_Adaptive_Xml.cs" />

From e8f8d70ff9d808eed79456f168c31a1ef122bebb Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 30 Oct 2020 10:20:56 -0600
Subject: [PATCH 39/46] Update toast samples to use ToastArguments

---
 .../SamplePages/Toast/ToastCode.bind                          | 4 +++-
 .../SamplePages/Toast/ToastPage.xaml.cs                       | 4 +++-
 .../WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind  | 4 +++-
 .../WeatherLiveTileAndToastPage.xaml.cs                       | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
index 30c2793d052..80b107e1ec9 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
@@ -2,7 +2,9 @@ private void PopToast()
 {
     // Generate the toast notification content and pop the toast
     new ToastContentBuilder().SetToastScenario(ToastScenario.Reminder)        
-        .AddToastActivationInfo("action=viewEvent&eventId=1983")        
+        .AddToastActivationInfo(new ToastArguments()        
+            .Set("action", "viewEvent")        
+            .Set("eventId", 1983))        
         .AddText("Adaptive Tiles Meeting")        
         .AddText("Conf Room 2001 / Building 135")        
         .AddText("10:00 AM - 10:30 AM")        
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs
index 440a81f313e..27ed11d6486 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs
@@ -29,7 +29,9 @@ public ToastPage()
         public static ToastContent GenerateToastContent()
         {
             var builder = new ToastContentBuilder().SetToastScenario(ToastScenario.Reminder)
-                .AddToastActivationInfo("action=viewEvent&eventId=1983", ToastActivationType.Foreground)
+                .AddToastActivationInfo(new ToastArguments()
+                    .Set("action", "viewEvent")
+                    .Set("eventId", 1983))
                 .AddText("Adaptive Tiles Meeting")
                 .AddText("Conf Room 2001 / Building 135")
                 .AddText("10:00 AM - 10:30 AM")
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
index 481e3b90646..279f5a25276 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
@@ -4,7 +4,9 @@ private void PopToast()
     ToastContentBuilder builder = new ToastContentBuilder();        
 
     // Include launch string so we know what to open when user clicks toast        
-    builder.AddToastActivationInfo("action=viewForecast&zip=98008");        
+    builder.AddToastActivationInfo(new ToastArguments()        
+        .Set("action", "viewForecast")        
+        .Set("zip", 98008));        
 
     // We'll always have this summary text on our toast notification        
     // (it is required that your toast starts with a text element)        
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
index b20f5df4584..67b578f4ffa 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
@@ -29,7 +29,9 @@ public static ToastContent GenerateToastContent()
             ToastContentBuilder builder = new ToastContentBuilder();
 
             // Include launch string so we know what to open when user clicks toast
-            builder.AddToastActivationInfo("action=viewForecast&zip=98008", ToastActivationType.Foreground);
+            builder.AddToastActivationInfo(new ToastArguments()
+                .Set("action", "viewForecast")
+                .Set("zip", 98008));
 
             // We'll always have this summary text on our toast notification
             // (it is required that your toast starts with a text element)

From 02ff3a88a99ff5dda2c44d289ee9e40efaf621eb Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 30 Oct 2020 11:21:41 -0600
Subject: [PATCH 40/46] Fixed bug in TileBuilder small tile content

The enum flags were incorrectly specified such that when adding content to Medium/Wide/Large tiles, it also added the content to small tiles, which was resulting in the small weather tile not appearing correctly.

Note that the small weather tile preview is still missing the temperature (must be bug in NotificationsVisualizerLibrary), but when pinned to Start it looks correct!
---
 Microsoft.Toolkit.Uwp.Notifications/Tiles/TileCommon.cs   | 8 ++++----
 .../WeatherLiveTileAndToastCode.bind                      | 4 ++--
 .../WeatherLiveTileAndToastPage.xaml.cs                   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileCommon.cs b/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileCommon.cs
index c2aabf2f040..c40e030f69d 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileCommon.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Tiles/TileCommon.cs
@@ -15,21 +15,21 @@ public enum TileSize
         /// <summary>
         /// Small Square Tile
         /// </summary>
-        Small = 0,
+        Small = 1,
 
         /// <summary>
         /// Medium Square Tile
         /// </summary>
-        Medium = 1,
+        Medium = 2,
 
         /// <summary>
         /// Wide Rectangle Tile
         /// </summary>
-        Wide = 2,
+        Wide = 4,
 
         /// <summary>
         /// Large Square Tile
         /// </summary>
-        Large = 4
+        Large = 8
     }
 }
\ No newline at end of file
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
index 279f5a25276..730783c8479 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
@@ -75,8 +75,8 @@ public static TileContent GenerateTileContent()
     // Small Tile        
     builder.AddTile(Notifications.TileSize.Small)        
         .SetTextStacking(TileTextStacking.Center, Notifications.TileSize.Small)        
-        .AddText("Mon", hintStyle: AdaptiveTextStyle.Body, hintAlign: AdaptiveTextAlign.Center)        
-        .AddText("63°", hintStyle: AdaptiveTextStyle.Base, hintAlign: AdaptiveTextAlign.Center);        
+        .AddText("Mon", Notifications.TileSize.Small, hintStyle: AdaptiveTextStyle.Body, hintAlign: AdaptiveTextAlign.Center)        
+        .AddText("63°", Notifications.TileSize.Small, hintStyle: AdaptiveTextStyle.Base, hintAlign: AdaptiveTextAlign.Center);        
 
     // Medium Tile        
     builder.AddTile(Notifications.TileSize.Medium)        
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
index 67b578f4ffa..735b2b6db48 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
@@ -75,8 +75,8 @@ public static TileContent GenerateTileContent()
             // Small Tile
             builder.AddTile(Notifications.TileSize.Small)
                 .SetTextStacking(TileTextStacking.Center, Notifications.TileSize.Small)
-                .AddText("Mon", hintStyle: AdaptiveTextStyle.Body, hintAlign: AdaptiveTextAlign.Center)
-                .AddText("63°", hintStyle: AdaptiveTextStyle.Base, hintAlign: AdaptiveTextAlign.Center);
+                .AddText("Mon", Notifications.TileSize.Small, hintStyle: AdaptiveTextStyle.Body, hintAlign: AdaptiveTextAlign.Center)
+                .AddText("63°", Notifications.TileSize.Small, hintStyle: AdaptiveTextStyle.Base, hintAlign: AdaptiveTextAlign.Center);
 
             // Medium Tile
             builder.AddTile(Notifications.TileSize.Medium)

From 8956b81ebb90cebf1d3554e62fca68fa92015a2c Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 30 Oct 2020 11:48:24 -0600
Subject: [PATCH 41/46] Add headers

---
 .../Toasts/ToastArguments.cs                                | 6 +++++-
 Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs | 6 +++---
 .../UnitTests.Notifications.Shared/TestToastArguments.cs    | 6 +++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
index fb61aea283a..989146ba55f 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
@@ -1,4 +1,8 @@
-using System;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs
index dd93d2d1865..13711b8ffdf 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs
@@ -1,6 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
 
 namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
 {
diff --git a/UnitTests/UnitTests.Notifications.Shared/TestToastArguments.cs b/UnitTests/UnitTests.Notifications.Shared/TestToastArguments.cs
index 7f170cf3ada..4b7eeb632e7 100644
--- a/UnitTests/UnitTests.Notifications.Shared/TestToastArguments.cs
+++ b/UnitTests/UnitTests.Notifications.Shared/TestToastArguments.cs
@@ -1,4 +1,8 @@
-using System;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Toolkit.Uwp.Notifications;

From f1a3f022022aaedacd550985a697dcfd2e0d3de2 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Wed, 4 Nov 2020 15:12:59 -0800
Subject: [PATCH 42/46] Update qmatteoq license

---
 ThirdPartyNotices.txt | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index 0fca67436eb..ec7322617dd 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -10,7 +10,7 @@ This project incorporates components from the projects listed below. The origina
 3.	lbugnion/mvvmlight commit 4cbf77c (https://github.com/lbugnion/mvvmlight), from which some APIs from the `Microsoft.Toolkit.Mvvm` package take inspiration from.
 4.  PrivateObject/PrivateType (https://github.com/microsoft/testfx/tree/664ac7c2ac9dbfbee9d2a0ef560cfd72449dfe34/src/TestFramework/Extension.Desktop), included in UnitTests.
 5.  QuinnDamerell/UniversalMarkdown (https://github.com/QuinnDamerell/UniversalMarkdown) contributed by Quinn Damerell and Paul Bartrum for the MarkdownTextBlock control, relicensed to this .NET Foundation project under the MIT license upon contribution in https://github.com/windows-toolkit/WindowsCommunityToolkit/pull/772.
-6.  qmatteoq/DesktopBridgeHelpers commit e278153 (https://github.com/qmatteoq/DesktopBridgeHelpers), using in DesktopNotificationManagerCompat.cs and DesktopBridgeHelpers.cs to identify if running with identity.
+6.  qmatteoq/DesktopBridgeHelpers commit e278153 (https://github.com/qmatteoq/DesktopBridgeHelpers), contributed by Matteo Pagani to identify if running with identity in DesktopNotificationManagerCompat.cs and DesktopBridgeHelpers.cs, relicensed to this .NET Foundation project under the MIT license upon contribution in https://github.com/windows-toolkit/WindowsCommunityToolkit/pull/3457.
 
 %% PedroLamas/DeferredEvents NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -113,30 +113,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
-END OF PrivateOject/PrivateType NOTICES AND INFORMATION
-
-%% qmatteoq/DesktopBridgeHelpers NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE
-=========================================
-END OF qmatteoq/DesktopBridgeHelpers NOTICES AND INFORMATION
\ No newline at end of file
+END OF PrivateOject/PrivateType NOTICES AND INFORMATION
\ No newline at end of file

From f9045dee9af7c041fa0be362abedf2bc7e715570 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 5 Nov 2020 15:12:32 -0800
Subject: [PATCH 43/46] Simplified generic toast arguments

---
 .../Builder/ToastContentBuilder.Actions.cs    |  57 +++-
 .../Toasts/Builder/ToastContentBuilder.cs     | 194 ++++++++++++--
 .../Toasts/ToastArguments.cs                  |  92 +++----
 .../Toasts/ToastButton.cs                     |   2 +-
 .../SamplePages/Toast/ToastCode.bind          |   4 +-
 .../SamplePages/Toast/ToastPage.xaml.cs       |   7 +-
 .../WeatherLiveTileAndToastCode.bind          |   4 +-
 .../WeatherLiveTileAndToastPage.xaml.cs       |   4 +-
 .../App.xaml.cs                               |  32 +--
 .../MainWindow.xaml.cs                        |  20 +-
 .../MyToastActions.cs                         |   5 -
 .../TestToastArguments.cs                     |  26 +-
 .../TestToastContentBuilder.cs                | 248 ++++++++++++++++--
 13 files changed, 546 insertions(+), 149 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs
index 8f35a959b17..49a8818c549 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs
@@ -60,7 +60,30 @@ private IList<IToastInput> InputList
 #endif
         public ToastContentBuilder AddButton(string content, ToastActivationType activationType, ToastArguments arguments)
         {
-            return AddButton(content, activationType, arguments.ToString());
+            AddButton(content, activationType, SerializeArgumentsIncludingGeneric(arguments));
+
+            // Remove this button from the custom arguments list
+            _buttonsUsingCustomArguments.RemoveAt(_buttonsUsingCustomArguments.Count - 1);
+
+            return this;
+        }
+
+        private string SerializeArgumentsIncludingGeneric(ToastArguments arguments)
+        {
+            if (_genericArguments.Count == 0)
+            {
+                return arguments.ToString();
+            }
+
+            foreach (var genericArg in _genericArguments)
+            {
+                if (!arguments.Contains(genericArg.Key))
+                {
+                    arguments.Add(genericArg.Key, genericArg.Value);
+                }
+            }
+
+            return arguments.ToString();
         }
 
         /// <summary>
@@ -76,7 +99,12 @@ public ToastContentBuilder AddButton(string content, ToastActivationType activat
 #endif
         public ToastContentBuilder AddButton(string content, ToastActivationType activationType, ToastArguments arguments, Uri imageUri)
         {
-            return AddButton(content, activationType, arguments.ToString(), imageUri);
+            AddButton(content, activationType, SerializeArgumentsIncludingGeneric(arguments), imageUri);
+
+            // Remove this button from the custom arguments list
+            _buttonsUsingCustomArguments.RemoveAt(_buttonsUsingCustomArguments.Count - 1);
+
+            return this;
         }
 
         /// <summary>
@@ -91,6 +119,19 @@ public ToastContentBuilder AddButton(string content, ToastActivationType activat
             return AddButton(content, activationType, arguments, default);
         }
 
+        /// <summary>
+        /// Add an button to the toast that will be display to the right of the input text box, achieving a quick reply scenario.
+        /// </summary>
+        /// <param name="textBoxId">ID of an existing <see cref="ToastTextBox"/> in order to have this button display to the right of the input, achieving a quick reply scenario.</param>
+        /// <param name="content">Text to display on the button.</param>
+        /// <param name="activationType">Type of activation this button will use when clicked. Defaults to Foreground.</param>
+        /// <param name="arguments">App-defined arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddButton(string textBoxId, string content, ToastActivationType activationType, ToastArguments arguments)
+        {
+            return AddButton(textBoxId, content, activationType, arguments, default);
+        }
+
         /// <summary>
         /// Add a button to the current toast.
         /// </summary>
@@ -129,7 +170,12 @@ public ToastContentBuilder AddButton(string content, ToastActivationType activat
 #endif
         public ToastContentBuilder AddButton(string textBoxId, string content, ToastActivationType activationType, ToastArguments arguments, Uri imageUri)
         {
-            return AddButton(textBoxId, content, activationType, arguments.ToString(), imageUri);
+            AddButton(textBoxId, content, activationType, SerializeArgumentsIncludingGeneric(arguments), imageUri);
+
+            // Remove this button from the custom arguments list
+            _buttonsUsingCustomArguments.RemoveAt(_buttonsUsingCustomArguments.Count - 1);
+
+            return this;
         }
 
         /// <summary>
@@ -147,6 +193,11 @@ public ToastContentBuilder AddButton(IToastButton button)
 
             ButtonList.Add(button);
 
+            if (button is ToastButton b)
+            {
+                _buttonsUsingCustomArguments.Add(b);
+            }
+
             return this;
         }
 
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
index 3f635cdae6d..be4ed3205c4 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
@@ -11,6 +12,12 @@ namespace Microsoft.Toolkit.Uwp.Notifications
     /// </summary>
     public partial class ToastContentBuilder
     {
+        private Dictionary<string, string> _genericArguments = new Dictionary<string, string>();
+
+        private bool _customArgumentsUsedOnToastItself;
+
+        private List<ToastButton> _buttonsUsingCustomArguments = new List<ToastButton>();
+
         /// <summary>
         /// Gets internal instance of <see cref="ToastContent"/>. This is equivalent to the call to <see cref="ToastContentBuilder.GetToastContent"/>.
         /// </summary>
@@ -44,6 +51,22 @@ public ToastContentBuilder AddCustomTimeStamp(
             return this;
         }
 
+        /// <summary>
+        /// Add a header to a toast.
+        /// </summary>
+        /// <param name="id">A developer-created identifier that uniquely identifies this header. If two notifications have the same header id, they will be displayed underneath the same header in Action Center.</param>
+        /// <param name="title">A title for the header.</param>
+        /// <param name="arguments">Developer-defined arguments that are returned to the app when the user clicks this header.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        /// <remarks>More info about toast header: https://docs.microsoft.com/en-us/windows/uwp/design/shell/tiles-and-notifications/toast-headers </remarks>
+#if WINRT
+        [Windows.Foundation.Metadata.DefaultOverload]
+#endif
+        public ToastContentBuilder AddHeader(string id, string title, ToastArguments arguments)
+        {
+            return AddHeader(id, title, arguments.ToString());
+        }
+
         /// <summary>
         /// Add a header to a toast.
         /// </summary>
@@ -60,44 +83,184 @@ public ToastContentBuilder AddHeader(string id, string title, string arguments)
         }
 
         /// <summary>
-        /// Add info that can be used by the application when the app was activated/launched by the toast. Uses foreground activation.
+        /// Adds a key (without value) to the activation arguments that will be returned when the toast notification or its buttons are clicked.
         /// </summary>
-        /// <param name="launchArgs">Custom app-defined launch arguments to be passed along on toast activation</param>
+        /// <param name="key">The key.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddArgument(string key)
+        {
+            return AddArgumentHelper(key, null);
+        }
+
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the toast notification or its buttons are clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
 #if WINRT
         [Windows.Foundation.Metadata.DefaultOverload]
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastContentBuilder")]
 #endif
-        public ToastContentBuilder AddToastActivationInfo(ToastArguments launchArgs)
+        public ToastContentBuilder AddArgument(string key, string value)
         {
-            return AddToastActivationInfo(launchArgs.ToString());
+            return AddArgumentHelper(key, value);
         }
 
         /// <summary>
-        /// Add info that can be used by the application when the app was activated/launched by the toast.
+        /// Adds a key/value to the activation arguments that will be returned when the toast notification or its buttons are clicked.
         /// </summary>
-        /// <param name="launchArgs">Custom app-defined launch arguments to be passed along on toast activation</param>
-        /// <param name="activationType">Set the activation type that will be used when the user click on this toast</param>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
 #if WINRT
-        [Windows.Foundation.Metadata.DefaultOverload]
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastContentBuilder")]
 #endif
-        public ToastContentBuilder AddToastActivationInfo(ToastArguments launchArgs, ToastActivationType activationType)
+        public ToastContentBuilder AddArgument(string key, int value)
         {
-            return AddToastActivationInfo(launchArgs.ToString(), activationType);
+            return AddArgumentHelper(key, value.ToString());
         }
 
         /// <summary>
-        /// Add info that can be used by the application when the app was activated/launched by the toast. Uses foreground activation.
+        /// Adds a key/value to the activation arguments that will be returned when the toast notification or its buttons are clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastContentBuilder")]
+#endif
+        public ToastContentBuilder AddArgument(string key, double value)
+        {
+            return AddArgumentHelper(key, value.ToString());
+        }
+
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the toast notification or its buttons are clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastContentBuilder")]
+#endif
+        public ToastContentBuilder AddArgument(string key, float value)
+        {
+            return AddArgumentHelper(key, value.ToString());
+        }
+
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the toast notification or its buttons are clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastContentBuilder")]
+#endif
+        public ToastContentBuilder AddArgument(string key, bool value)
+        {
+            return AddArgumentHelper(key, value ? "1" : "0"); // Encode as 1 or 0 to save string space
+        }
+
+#if !WINRT
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the toast notification or its buttons are clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself. Note that the enums are stored using their numeric value, so be aware that changing your enum number values might break existing activation of toasts currently in Action Center.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder AddArgument(string key, Enum value)
+        {
+            return AddArgumentHelper(key, ((int)(object)value).ToString());
+        }
+#endif
+
+        private ToastContentBuilder AddArgumentHelper(string key, string value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            bool alreadyExists = _genericArguments.ContainsKey(key);
+
+            _genericArguments[key] = value;
+
+            if (Content.ActivationType != ToastActivationType.Protocol && !_customArgumentsUsedOnToastItself)
+            {
+                Content.Launch = alreadyExists ? SerializeArgumentsHelper(_genericArguments) : AddArgumentHelper(Content.Launch, key, value);
+            }
+
+            if (Content.Actions is ToastActionsCustom actions)
+            {
+                foreach (var button in actions.Buttons)
+                {
+                    if (button is ToastButton b && b.ActivationType != ToastActivationType.Protocol && !_buttonsUsingCustomArguments.Contains(b))
+                    {
+                        var bArgs = ToastArguments.Parse(b.Arguments);
+                        if (!bArgs.Contains(key))
+                        {
+                            bArgs.Add(key, value);
+                            b.Arguments = bArgs.ToString();
+                        }
+                    }
+                }
+            }
+
+            return this;
+        }
+
+        private string SerializeArgumentsHelper(IDictionary<string, string> arguments)
+        {
+            var args = new ToastArguments();
+
+            foreach (var a in arguments)
+            {
+                args.Add(a.Key, a.Value);
+            }
+
+            return args.ToString();
+        }
+
+        private string AddArgumentHelper(string existing, string key, string value)
+        {
+            string pair = ToastArguments.EncodePair(key, value);
+
+            if (existing == null)
+            {
+                return pair;
+            }
+            else
+            {
+                return existing + ToastArguments.Separator + pair;
+            }
+        }
+
+        /// <summary>
+        /// Configures the toast notification to launch the specified url when the toast body is clicked.
+        /// </summary>
+        /// <param name="protocol">The protocol to launch.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder SetProtocolActivation(Uri protocol)
+        {
+            Content.Launch = protocol.ToString();
+            Content.ActivationType = ToastActivationType.Protocol;
+            return this;
+        }
+
+        /// <summary>
+        /// Configures the toast notification to use background activation when the toast body is clicked.
         /// </summary>
-        /// <param name="launchArgs">Custom app-defined launch arguments to be passed along on toast activation</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-        public ToastContentBuilder AddToastActivationInfo(string launchArgs)
+        public ToastContentBuilder SetBackgroundActivation()
         {
-            return AddToastActivationInfo(launchArgs, ToastActivationType.Foreground);
+            Content.ActivationType = ToastActivationType.Background;
+            return this;
         }
 
         /// <summary>
-        /// Add info that can be used by the application when the app was activated/launched by the toast.
+        /// Instead of this method, for foreground/background activation, it is suggested to use <see cref="AddArgument(string, string)"/> and optionally <see cref="SetBackgroundActivation"/>. For protocol activation, you should use <see cref="SetProtocolActivation(Uri)"/>. Add info that can be used by the application when the app was activated/launched by the toast.
         /// </summary>
         /// <param name="launchArgs">Custom app-defined launch arguments to be passed along on toast activation</param>
         /// <param name="activationType">Set the activation type that will be used when the user click on this toast</param>
@@ -106,6 +269,7 @@ public ToastContentBuilder AddToastActivationInfo(string launchArgs, ToastActiva
         {
             Content.Launch = launchArgs;
             Content.ActivationType = activationType;
+            _customArgumentsUsedOnToastItself = true;
             return this;
         }
 
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
index 989146ba55f..f5dd09b95f4 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastArguments.cs
@@ -16,6 +16,14 @@ public sealed class ToastArguments : IEnumerable<KeyValuePair<string, string>>
     {
         private Dictionary<string, string> _dictionary = new Dictionary<string, string>();
 
+        internal ToastArguments Clone()
+        {
+            return new ToastArguments()
+            {
+                _dictionary = new Dictionary<string, string>(_dictionary)
+            };
+        }
+
 #if !WINRT
         /// <summary>
         /// Gets the value of the specified key. Throws <see cref="KeyNotFoundException"/> if the key could not be found.
@@ -186,43 +194,14 @@ public T GetEnum<T>(string key)
         public int Count => _dictionary.Count;
 
         /// <summary>
-        /// Adds a key (without a value) to the arguments. If the key already exists, throws an exception.
-        /// </summary>
-        /// <param name="key">The name of the parameter.</param>
-        public void Add(string key)
-        {
-            if (key == null)
-            {
-                throw new ArgumentNullException(nameof(key));
-            }
-
-            _dictionary.Add(key, null);
-        }
-
-        /// <summary>
-        /// Adds a key and optional value to the arguments. If the key already exists, throws an exception.
-        /// </summary>
-        /// <param name="key">The name of the parameter.</param>
-        /// <param name="value">The optional value of the key.</param>
-        public void Add(string key, string value)
-        {
-            if (key == null)
-            {
-                throw new ArgumentNullException(nameof(key));
-            }
-
-            _dictionary.Add(key, value);
-        }
-
-        /// <summary>
-        /// Sets a key. If there is an existing key, it is replaced.
+        /// Adds a key. If there is an existing key, it is replaced.
         /// </summary>
         /// <param name="key">The key.</param>
         /// <returns>The current <see cref="ToastArguments"/> object.</returns>
 #if WINRT
         [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastArguments")]
 #endif
-        public ToastArguments Set(string key)
+        public ToastArguments Add(string key)
         {
             if (key == null)
             {
@@ -235,7 +214,7 @@ public ToastArguments Set(string key)
         }
 
         /// <summary>
-        /// Sets a key and optional value. If there is an existing key, it is replaced.
+        /// Adds a key and optional value. If there is an existing key, it is replaced.
         /// </summary>
         /// <param name="key">The key.</param>
         /// <param name="value">The optional value of the key.</param>
@@ -244,7 +223,7 @@ public ToastArguments Set(string key)
         [Windows.Foundation.Metadata.DefaultOverload]
         [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastArguments")]
 #endif
-        public ToastArguments Set(string key, string value)
+        public ToastArguments Add(string key, string value)
         {
             if (key == null)
             {
@@ -257,7 +236,7 @@ public ToastArguments Set(string key, string value)
         }
 
         /// <summary>
-        /// Sets a key and value. If there is an existing key, it is replaced.
+        /// Adds a key and value. If there is an existing key, it is replaced.
         /// </summary>
         /// <param name="key">The key.</param>
         /// <param name="value">The value of the key.</param>
@@ -265,13 +244,13 @@ public ToastArguments Set(string key, string value)
 #if WINRT
         [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastArguments")]
 #endif
-        public ToastArguments Set(string key, int value)
+        public ToastArguments Add(string key, int value)
         {
-            return SetHelper(key, value);
+            return AddHelper(key, value);
         }
 
         /// <summary>
-        /// Sets a key and value. If there is an existing key, it is replaced.
+        /// Adds a key and value. If there is an existing key, it is replaced.
         /// </summary>
         /// <param name="key">The key.</param>
         /// <param name="value">The value of the key.</param>
@@ -279,13 +258,13 @@ public ToastArguments Set(string key, int value)
 #if WINRT
         [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastArguments")]
 #endif
-        public ToastArguments Set(string key, double value)
+        public ToastArguments Add(string key, double value)
         {
-            return SetHelper(key, value);
+            return AddHelper(key, value);
         }
 
         /// <summary>
-        /// Sets a key and value. If there is an existing key, it is replaced.
+        /// Adds a key and value. If there is an existing key, it is replaced.
         /// </summary>
         /// <param name="key">The key.</param>
         /// <param name="value">The value of the key.</param>
@@ -293,13 +272,13 @@ public ToastArguments Set(string key, double value)
 #if WINRT
         [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastArguments")]
 #endif
-        public ToastArguments Set(string key, float value)
+        public ToastArguments Add(string key, float value)
         {
-            return SetHelper(key, value);
+            return AddHelper(key, value);
         }
 
         /// <summary>
-        /// Sets a key and value. If there is an existing key, it is replaced.
+        /// Adds a key and value. If there is an existing key, it is replaced.
         /// </summary>
         /// <param name="key">The key.</param>
         /// <param name="value">The value of the key.</param>
@@ -307,25 +286,25 @@ public ToastArguments Set(string key, float value)
 #if WINRT
         [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("toastArguments")]
 #endif
-        public ToastArguments Set(string key, bool value)
+        public ToastArguments Add(string key, bool value)
         {
-            return Set(key, value ? "1" : "0"); // Encode as 1 or 0 to save string space
+            return Add(key, value ? "1" : "0"); // Encode as 1 or 0 to save string space
         }
 
 #if !WINRT
         /// <summary>
-        /// Sets a key and value. If there is an existing key, it is replaced.
+        /// Adds a key and value. If there is an existing key, it is replaced.
         /// </summary>
         /// <param name="key">The key.</param>
         /// <param name="value">The value of the key. Note that the enums are stored using their numeric value, so be aware that changing your enum number values might break existing activation of toasts currently in Action Center.</param>
         /// <returns>The current <see cref="ToastArguments"/> object.</returns>
-        public ToastArguments Set(string key, Enum value)
+        public ToastArguments Add(string key, Enum value)
         {
-            return Set(key, (int)(object)value);
+            return Add(key, (int)(object)value);
         }
 #endif
 
-        private ToastArguments SetHelper(string key, object value)
+        private ToastArguments AddHelper(string key, object value)
         {
             if (key == null)
             {
@@ -448,15 +427,20 @@ public static ToastArguments Parse(string toastArgumentsStr)
         /// <returns>A string that can be used within a toast notification.</returns>
         public sealed override string ToString()
         {
-            return string.Join(";", this.Select(pair =>
+            return string.Join(Separator, this.Select(pair => EncodePair(pair.Key, pair.Value)));
+        }
 
-                    // Key
-                    Encode(pair.Key) +
+        internal static string EncodePair(string key, string value)
+        {
+            // Key
+            return Encode(key) +
 
-                    // Write value if not null
-                    ((pair.Value == null) ? string.Empty : ("=" + Encode(pair.Value)))));
+                // Write value if not null
+                ((value == null) ? string.Empty : ("=" + Encode(value)));
         }
 
+        internal const string Separator = ";";
+
         /// <summary>
         /// Gets an enumerator to enumerate the arguments. Note that order of the arguments is NOT preserved.
         /// </summary>
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastButton.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastButton.cs
index 522a5c254c9..bc9fd89b265 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastButton.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastButton.cs
@@ -41,7 +41,7 @@ public ToastButton(string content, string arguments)
         /// Gets app-defined string of arguments that the app can later retrieve once it is
         /// activated when the user clicks the button. Required
         /// </summary>
-        public string Arguments { get; private set; }
+        public string Arguments { get; internal set; }
 
         /// <summary>
         /// Gets or sets what type of activation this button will use when clicked. Defaults to Foreground.
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
index 80b107e1ec9..59da8ba547d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
@@ -2,9 +2,7 @@ private void PopToast()
 {
     // Generate the toast notification content and pop the toast
     new ToastContentBuilder().SetToastScenario(ToastScenario.Reminder)        
-        .AddToastActivationInfo(new ToastArguments()        
-            .Set("action", "viewEvent")        
-            .Set("eventId", 1983))        
+        .AddArgument("eventId", 1983)        
         .AddText("Adaptive Tiles Meeting")        
         .AddText("Conf Room 2001 / Building 135")        
         .AddText("10:00 AM - 10:30 AM")        
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs
index 27ed11d6486..1843f424a0d 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs
@@ -28,10 +28,9 @@ public ToastPage()
 
         public static ToastContent GenerateToastContent()
         {
-            var builder = new ToastContentBuilder().SetToastScenario(ToastScenario.Reminder)
-                .AddToastActivationInfo(new ToastArguments()
-                    .Set("action", "viewEvent")
-                    .Set("eventId", 1983))
+            var builder = new ToastContentBuilder()
+                .SetToastScenario(ToastScenario.Reminder)
+                .AddArgument("eventId", 1983)
                 .AddText("Adaptive Tiles Meeting")
                 .AddText("Conf Room 2001 / Building 135")
                 .AddText("10:00 AM - 10:30 AM")
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
index 730783c8479..6e05a17e505 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
@@ -4,9 +4,7 @@ private void PopToast()
     ToastContentBuilder builder = new ToastContentBuilder();        
 
     // Include launch string so we know what to open when user clicks toast        
-    builder.AddToastActivationInfo(new ToastArguments()        
-        .Set("action", "viewForecast")        
-        .Set("zip", 98008));        
+    builder.AddArgument("zip", 98008);     
 
     // We'll always have this summary text on our toast notification        
     // (it is required that your toast starts with a text element)        
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
index 735b2b6db48..22ed38e811b 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
@@ -29,9 +29,7 @@ public static ToastContent GenerateToastContent()
             ToastContentBuilder builder = new ToastContentBuilder();
 
             // Include launch string so we know what to open when user clicks toast
-            builder.AddToastActivationInfo(new ToastArguments()
-                .Set("action", "viewForecast")
-                .Set("zip", 98008));
+            builder.AddArgument("zip", 98008);
 
             // We'll always have this summary text on our toast notification
             // (it is required that your toast starts with a text element)
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
index 6e587b53bf2..d78b39202d8 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
@@ -47,8 +47,18 @@ private void ToastNotificationManagerCompat_OnActivated(ToastNotificationActivat
                 // Parse the toast arguments
                 ToastArguments args = ToastArguments.Parse(e.Argument);
 
-                // See what action is being requested
-                if (args.TryGetValue("action", out MyToastActions action))
+                int conversationId = args.GetInt("conversationId");
+
+                // If no specific action, view the conversation
+                if (!args.TryGetValue("action", out MyToastActions action))
+                {
+                    // Make sure we have a window open and in foreground
+                    OpenWindowIfNeeded();
+
+                    // And then show the conversation
+                    (Current.Windows[0] as MainWindow).ShowConversation(conversationId);
+                }
+                else
                 {
                     switch (action)
                     {
@@ -66,20 +76,6 @@ private void ToastNotificationManagerCompat_OnActivated(ToastNotificationActivat
 
                             break;
 
-                        // Open the conversation
-                        case MyToastActions.ViewConversation:
-
-                            // The conversation ID retrieved from the toast args
-                            int conversationId = args.GetInt("conversationId");
-
-                            // Make sure we have a window open and in foreground
-                            OpenWindowIfNeeded();
-
-                            // And then show the conversation
-                            (Current.Windows[0] as MainWindow).ShowConversation();
-
-                            break;
-
                         // Background: Quick reply to the conversation
                         case MyToastActions.Reply:
 
@@ -87,7 +83,7 @@ private void ToastNotificationManagerCompat_OnActivated(ToastNotificationActivat
                             string msg = e.UserInput["tbReply"] as string;
 
                             // And send this message
-                            ShowToast("Message sent: " + msg);
+                            ShowToast("Message sent: " + msg + "\nconversationId: " + conversationId);
 
                             // If there's no windows open, exit the app
                             if (Current.Windows.Count == 0)
@@ -100,7 +96,7 @@ private void ToastNotificationManagerCompat_OnActivated(ToastNotificationActivat
                         // Background: Send a like
                         case MyToastActions.Like:
 
-                            ShowToast("Like sent!");
+                            ShowToast($"Like sent to conversation {conversationId}!");
 
                             // If there's no windows open, exit the app
                             if (Current.Windows.Count == 0)
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
index 84cb107ffdb..49d9c9227cc 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
@@ -35,10 +35,8 @@ private async void ButtonPopToast_Click(object sender, RoutedEventArgs e)
             // Construct the toast content and show it!
             new ToastContentBuilder()
 
-                // Arguments when the user taps body of toast
-                .AddToastActivationInfo(new ToastArguments()
-                    .Set("action", MyToastActions.ViewConversation)
-                    .Set("conversationId", conversationId))
+                // Arguments that are returned when the user clicks the toast or a button
+                .AddArgument("conversationId", conversationId)
 
                 // Visual content
                 .AddText(title)
@@ -51,16 +49,14 @@ private async void ButtonPopToast_Click(object sender, RoutedEventArgs e)
 
                 // Buttons
                 .AddButton("Reply", ToastActivationType.Background, new ToastArguments()
-                    .Set("action", MyToastActions.Reply)
-                    .Set("conversationId", conversationId))
+                    .Add("action", MyToastActions.Reply))
 
                 .AddButton("Like", ToastActivationType.Background, new ToastArguments()
-                    .Set("action", MyToastActions.Like)
-                    .Set("conversationId", conversationId))
+                    .Add("action", MyToastActions.Like))
 
                 .AddButton("View", ToastActivationType.Foreground, new ToastArguments()
-                    .Set("action", MyToastActions.ViewImage)
-                    .Set("imageUrl", image))
+                    .Add("action", MyToastActions.ViewImage)
+                    .Add("imageUrl", image))
 
                 // And show the toast!
                 .Show();
@@ -121,11 +117,11 @@ private static async Task<string> DownloadImageToDisk(string httpImage)
             }
         }
 
-        internal void ShowConversation()
+        internal void ShowConversation(int conversationId)
         {
             ContentBody.Content = new TextBlock()
             {
-                Text = "You've just opened a conversation!",
+                Text = "You've just opened conversation " + conversationId,
                 FontWeight = FontWeights.Bold
             };
         }
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs
index 13711b8ffdf..acdaf7dc5a7 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs
@@ -6,11 +6,6 @@ namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
 {
     public enum MyToastActions
     {
-        /// <summary>
-        /// View the conversation
-        /// </summary>
-        ViewConversation,
-
         /// <summary>
         /// Inline reply to a message
         /// </summary>
diff --git a/UnitTests/UnitTests.Notifications.Shared/TestToastArguments.cs b/UnitTests/UnitTests.Notifications.Shared/TestToastArguments.cs
index 4b7eeb632e7..d7d9abec910 100644
--- a/UnitTests/UnitTests.Notifications.Shared/TestToastArguments.cs
+++ b/UnitTests/UnitTests.Notifications.Shared/TestToastArguments.cs
@@ -261,7 +261,7 @@ public void TestContains()
             Assert.IsTrue(qs.Contains("isBook", null));
             Assert.IsFalse(qs.Contains("isBook", "True"));
 
-            qs.Set("isBook", "True");
+            qs.Add("isBook", "True");
 
             Assert.IsTrue(qs.Contains("isBook"));
             Assert.IsFalse(qs.Contains("isBook", null));
@@ -278,11 +278,11 @@ public void TestContains()
         }
 
         [TestMethod]
-        public void TestSet()
+        public void TestAdd()
         {
             ToastArguments qs = new ToastArguments();
 
-            qs.Set("name", "Andrew");
+            qs.Add("name", "Andrew");
 
             AssertEqual(
                 new ToastArguments()
@@ -290,7 +290,7 @@ public void TestSet()
                     { "name", "Andrew" }
                 }, qs);
 
-            qs.Set("age", "22");
+            qs.Add("age", "22");
 
             AssertEqual(
                 new ToastArguments()
@@ -299,7 +299,7 @@ public void TestSet()
                     { "age", "22" }
                 }, qs);
 
-            qs.Set("name", "Lei");
+            qs.Add("name", "Lei");
 
             AssertEqual(
                 new ToastArguments()
@@ -309,7 +309,7 @@ public void TestSet()
                 }, qs);
 
             string nullStr = null;
-            qs.Set("name", nullStr);
+            qs.Add("name", nullStr);
 
             AssertEqual(
                 new ToastArguments()
@@ -361,15 +361,15 @@ public void TestCount()
         public void TestStronglyTyped()
         {
             ToastArguments args = new ToastArguments()
-                .Set("isAdult", true)
-                .Set("isPremium", false)
-                .Set("age", 22)
-                .Set("level", 0)
-                .Set("gpa", 3.97)
-                .Set("percent", 97.3f);
+                .Add("isAdult", true)
+                .Add("isPremium", false)
+                .Add("age", 22)
+                .Add("level", 0)
+                .Add("gpa", 3.97)
+                .Add("percent", 97.3f);
 
 #if !WINRT
-            args.Set("activationKind", ToastActivationType.Background);
+            args.Add("activationKind", ToastActivationType.Background);
 #endif
 
             AssertEqual(
diff --git a/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs b/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
index 89d55e4060f..7a57a850214 100644
--- a/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
+++ b/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
@@ -47,6 +47,27 @@ public void AddHeaderTest_WithExpectedArgs_ReturnSelfWithHeaderAdded()
             Assert.AreEqual(testToastArguments, builder.Content.Header.Arguments);
         }
 
+        [TestMethod]
+        public void AddHeaderTest_WithExpectedArgsAndToastArguments_ReturnSelfWithHeaderAdded()
+        {
+            // Arrange
+            string testToastHeaderId = "Test Header ID";
+            string testToastTitle = "Test Toast Title";
+            ToastArguments testToastArguments = new ToastArguments()
+                .Add("arg1", 5)
+                .Add("arg2", "tacos");
+
+            // Act
+            ToastContentBuilder builder = new ToastContentBuilder();
+            ToastContentBuilder anotherReference = builder.AddHeader(testToastHeaderId, testToastTitle, testToastArguments);
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+            Assert.AreEqual(testToastHeaderId, builder.Content.Header.Id);
+            Assert.AreEqual(testToastTitle, builder.Content.Header.Title);
+            Assert.AreEqual(testToastArguments.ToString(), builder.Content.Header.Arguments);
+        }
+
         [TestMethod]
         public void AddToastActivationInfoTest_WithExpectedArgs_ReturnSelfWithActivationInfoAdded()
         {
@@ -65,36 +86,233 @@ public void AddToastActivationInfoTest_WithExpectedArgs_ReturnSelfWithActivation
         }
 
         [TestMethod]
-        public void AddToastActivationInfoDefaultTest_WithExpectedArgs_ReturnSelfWithActivationInfoAdded()
+        public void AddArgumentTest_Basic_ReturnSelfWithArgumentsAdded()
         {
-            // Arrange
-            string testToastLaunchArugments = "Test Toast Launch Args";
+            // Act
+            ToastContentBuilder builder = new ToastContentBuilder();
+            ToastContentBuilder anotherReference = builder
+                .AddArgument("userId", 542)
+                .AddArgument("name", "Andrew");
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+            Assert.AreEqual("userId=542;name=Andrew", builder.Content.Launch);
+        }
 
+        [TestMethod]
+        public void AddArgumentTest_NoValue_ReturnSelfWithArgumentsAdded()
+        {
             // Act
             ToastContentBuilder builder = new ToastContentBuilder();
-            ToastContentBuilder anotherReference = builder.AddToastActivationInfo(testToastLaunchArugments);
+            ToastContentBuilder anotherReference = builder
+                .AddArgument("isPurelyInformational");
 
             // Assert
             Assert.AreSame(builder, anotherReference);
-            Assert.AreEqual(testToastLaunchArugments, builder.Content.Launch);
-            Assert.AreEqual(ToastActivationType.Foreground, builder.Content.ActivationType);
+            Assert.AreEqual("isPurelyInformational", builder.Content.Launch);
         }
 
         [TestMethod]
-        public void AddToastActivationInfoTest_WithExpectedArgs_UsingToastArguments()
+        public void AddArgumentTest_Escaping_ReturnSelfWithArgumentsAdded()
+        {
+            // Act
+            ToastContentBuilder builder = new ToastContentBuilder();
+            ToastContentBuilder anotherReference = builder
+                .AddArgument("user;Id", "andrew=leader%26bares");
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+            Assert.AreEqual("user%3BId=andrew%3Dleader%2526bares", builder.Content.Launch);
+        }
+
+        [TestMethod]
+        public void AddArgumentTest_Replacing_ReturnSelfWithArgumentsAdded()
+        {
+            // Act
+            ToastContentBuilder builder = new ToastContentBuilder();
+            ToastContentBuilder anotherReference = builder
+                .AddArgument("userId", 542)
+                .AddArgument("name", "Andrew")
+                .AddArgument("userId", 601);
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+            Assert.AreEqual("userId=601;name=Andrew", builder.Content.Launch);
+        }
+
+        [TestMethod]
+        public void AddArgumentTest_Generic_ReturnSelfWithArgumentsAdded()
         {
             // Arrange
-            ToastArguments args = new ToastArguments().Set("name", "Andrew");
-            ToastActivationType testToastActivationType = ToastActivationType.Background;
+            const string userIdKey = "userId";
+            const int userIdValue = 542;
 
             // Act
             ToastContentBuilder builder = new ToastContentBuilder();
-            ToastContentBuilder anotherReference = builder.AddToastActivationInfo(args, testToastActivationType);
+            ToastContentBuilder anotherReference = builder
+                .AddButton("Accept", ToastActivationType.Background, new ToastArguments()
+                    .Add("action", "accept"))
+                .AddButton(new ToastButtonSnooze())
+                .AddButton("View", ToastActivationType.Protocol, "https://msn.com")
+
+                // Add generic arguments halfway through (should be applied to existing buttons and to any subsequent buttons added later)
+                .AddArgument(userIdKey, userIdValue)
+
+                .AddButton("Decline", ToastActivationType.Background, new ToastArguments()
+                    .Add("action", "decline"))
+                .AddButton("Report", ToastActivationType.Protocol, "https://microsoft.com");
 
             // Assert
             Assert.AreSame(builder, anotherReference);
-            Assert.AreEqual(args.ToString(), builder.Content.Launch);
-            Assert.AreEqual(testToastActivationType, builder.Content.ActivationType);
+
+            // Top level arguments should be present
+            Assert.AreEqual("userId=542", builder.Content.Launch);
+
+            // All foreground/background activation buttons should have received generic arguments. Protocol and system activation buttons shouldn't have had any arguments changed.
+            var actions = builder.Content.Actions as ToastActionsCustom;
+
+            var button1 = actions.Buttons[0] as ToastButton;
+            Assert.AreEqual("Accept", button1.Content);
+            Assert.AreEqual("action=accept;userId=542", button1.Arguments);
+
+            var button2 = actions.Buttons[1];
+            Assert.IsInstanceOfType(button2, typeof(ToastButtonSnooze));
+
+            var button3 = actions.Buttons[2] as ToastButton;
+            Assert.AreEqual("View", button3.Content);
+            Assert.AreEqual("https://msn.com", button3.Arguments);
+
+            var button4 = actions.Buttons[3] as ToastButton;
+            Assert.AreEqual("Decline", button4.Content);
+            Assert.AreEqual("action=decline;userId=542", button4.Arguments);
+
+            var button5 = actions.Buttons[4] as ToastButton;
+            Assert.AreEqual("Report", button5.Content);
+            Assert.AreEqual("https://microsoft.com", button5.Arguments);
+        }
+
+        [TestMethod]
+        public void AddArgumentTest_ReplacingWithinButton_ReturnSelfWithArgumentsAdded()
+        {
+            // Act
+            ToastContentBuilder builder = new ToastContentBuilder();
+            ToastContentBuilder anotherReference = builder
+                .AddButton("Accept", ToastActivationType.Background, new ToastArguments()
+                    .Add("action", "accept")
+                    .Add("userId", 601))
+
+                // Add generic arguments halfway through (should be applied to existing buttons and to any subsequent buttons added later)
+                .AddArgument("userId", 542)
+
+                .AddButton("Decline", ToastActivationType.Background, new ToastArguments()
+                    .Add("action", "decline")
+                    .Add("userId", 601));
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+
+            // Top level arguments should be present
+            Assert.AreEqual("userId=542", builder.Content.Launch);
+
+            // Buttons should have overridden the generic userId
+            var actions = builder.Content.Actions as ToastActionsCustom;
+
+            var button1 = actions.Buttons[0] as ToastButton;
+            Assert.AreEqual("Accept", button1.Content);
+            Assert.AreEqual("action=accept;userId=601", button1.Arguments);
+
+            var button2 = actions.Buttons[1] as ToastButton;
+            Assert.AreEqual("Decline", button2.Content);
+            Assert.AreEqual("action=decline;userId=601", button2.Arguments);
+        }
+
+        [TestMethod]
+        public void AddArgumentTest_AvoidModifyingCustomButtons_ReturnSelfWithArgumentsAdded()
+        {
+            // Act
+            ToastContentBuilder builder = new ToastContentBuilder();
+            ToastContentBuilder anotherReference = builder
+                .AddToastActivationInfo("myCustomLaunchStr", ToastActivationType.Foreground)
+
+                .AddButton("Accept", ToastActivationType.Background, "myAcceptStr")
+
+                // userId shouldn't be added to any of these except view
+                .AddArgument("userId", 542)
+
+                .AddButton("Decline", ToastActivationType.Background, "myDeclineStr")
+
+                .AddButton("View", ToastActivationType.Foreground, new ToastArguments()
+                    .Add("action", "view"));
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+
+            // Top level arguments should be the custom string since user set that
+            Assert.AreEqual("myCustomLaunchStr", builder.Content.Launch);
+
+            // Buttons should have their custom strings except the last
+            var actions = builder.Content.Actions as ToastActionsCustom;
+
+            var button1 = actions.Buttons[0] as ToastButton;
+            Assert.AreEqual("Accept", button1.Content);
+            Assert.AreEqual("myAcceptStr", button1.Arguments);
+
+            var button2 = actions.Buttons[1] as ToastButton;
+            Assert.AreEqual("Decline", button2.Content);
+            Assert.AreEqual("myDeclineStr", button2.Arguments);
+
+            var button3 = actions.Buttons[2] as ToastButton;
+            Assert.AreEqual("View", button3.Content);
+            Assert.AreEqual("action=view;userId=542", button3.Arguments);
+        }
+
+        [TestMethod]
+        public void AddArgumentTest_BackgroundActivation_ReturnSelfWithArgumentsAdded()
+        {
+            // Act
+            ToastContentBuilder builder = new ToastContentBuilder();
+            ToastContentBuilder anotherReference = builder
+                .AddArgument("userId", 542)
+                .SetBackgroundActivation();
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+            Assert.AreEqual("userId=542", builder.Content.Launch);
+            Assert.AreEqual(ToastActivationType.Background, builder.Content.ActivationType);
+        }
+
+        [TestMethod]
+        public void SetProtocolActivationTest_ReturnSelfWithArgumentsAdded()
+        {
+            // Act
+            ToastContentBuilder builder = new ToastContentBuilder();
+            ToastContentBuilder anotherReference = builder
+                .AddButton("Accept", ToastActivationType.Background, new ToastArguments()
+                    .Add("action", "accept"))
+
+                .AddArgument("userId", 542)
+
+                .SetProtocolActivation(new Uri("https://msn.com/"))
+
+                .AddArgument("name", "Andrew")
+
+                .AddButton("Decline", ToastActivationType.Background, new ToastArguments()
+                    .Add("action", "decline"));
+
+            // Assert
+            Assert.AreSame(builder, anotherReference);
+            Assert.AreEqual("https://msn.com/", builder.Content.Launch);
+            Assert.AreEqual(ToastActivationType.Protocol, builder.Content.ActivationType);
+
+            var actions = builder.Content.Actions as ToastActionsCustom;
+
+            var button1 = actions.Buttons[0] as ToastButton;
+            Assert.AreEqual("Accept", button1.Content);
+            Assert.AreEqual("action=accept;userId=542;name=Andrew", button1.Arguments);
+
+            var button2 = actions.Buttons[1] as ToastButton;
+            Assert.AreEqual("Decline", button2.Content);
+            Assert.AreEqual("action=decline;userId=542;name=Andrew", button2.Arguments);
         }
 
         [TestMethod]
@@ -568,7 +786,7 @@ public void AddButtonTest_WithTextOnlyButtonAndToastArguments_ReturnSelfWithButt
             // Arrange
             string testButtonContent = "Test Button Content";
             ToastActivationType testToastActivationType = ToastActivationType.Background;
-            var testButtonLaunchArgs = new ToastArguments().Set("action", "view");
+            var testButtonLaunchArgs = new ToastArguments().Add("action", "view");
             ToastContentBuilder builder = new ToastContentBuilder();
 
             // Act
@@ -613,7 +831,7 @@ public void AddButtonTest_WithCustomImageAndTextButtonAndToastArguments_ReturnSe
             // Arrange
             string testButtonContent = "Test Button Content";
             ToastActivationType testToastActivationType = ToastActivationType.Background;
-            var testButtonLaunchArgs = new ToastArguments().Set("action", "accept");
+            var testButtonLaunchArgs = new ToastArguments().Add("action", "accept");
             Uri testImageUriSrc = new Uri("C:/justatesturi.jpg");
 
             ToastContentBuilder builder = new ToastContentBuilder();
@@ -664,7 +882,7 @@ public void AddButtonTest_WithTextBoxIdAndToastArguments_ReturnSelfWithButtonAdd
             string testInputTextBoxId = Guid.NewGuid().ToString();
             string testButtonContent = "Test Button Content";
             ToastActivationType testToastActivationType = ToastActivationType.Background;
-            var testButtonLaunchArgs = new ToastArguments().Set("action", "send");
+            var testButtonLaunchArgs = new ToastArguments().Add("action", "send");
             Uri testImageUriSrc = new Uri("C:/justatesturi.jpg");
 
             ToastContentBuilder builder = new ToastContentBuilder();

From 89ed383f5db3f8103658d1f1fbb093c14b1d4abc Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Thu, 5 Nov 2020 18:50:28 -0800
Subject: [PATCH 44/46] Add back top level action type in samples

---
 .../SamplePages/Toast/ToastCode.bind          |  1 +
 .../SamplePages/Toast/ToastPage.xaml.cs       |  1 +
 .../WeatherLiveTileAndToastCode.bind          |  1 +
 .../WeatherLiveTileAndToastPage.xaml.cs       |  1 +
 .../App.xaml.cs                               | 21 +++++++++++--------
 .../MainWindow.xaml.cs                        |  1 +
 .../MyToastActions.cs                         |  5 +++++
 7 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
index 59da8ba547d..9d72fed3c34 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
@@ -2,6 +2,7 @@ private void PopToast()
 {
     // Generate the toast notification content and pop the toast
     new ToastContentBuilder().SetToastScenario(ToastScenario.Reminder)        
+        .AddArgument("action", "viewEvent")        
         .AddArgument("eventId", 1983)        
         .AddText("Adaptive Tiles Meeting")        
         .AddText("Conf Room 2001 / Building 135")        
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs
index 1843f424a0d..896795bec19 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastPage.xaml.cs
@@ -30,6 +30,7 @@ public static ToastContent GenerateToastContent()
         {
             var builder = new ToastContentBuilder()
                 .SetToastScenario(ToastScenario.Reminder)
+                .AddArgument("action", "viewEvent")
                 .AddArgument("eventId", 1983)
                 .AddText("Adaptive Tiles Meeting")
                 .AddText("Conf Room 2001 / Building 135")
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
index 6e05a17e505..31d86950b79 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastCode.bind
@@ -4,6 +4,7 @@ private void PopToast()
     ToastContentBuilder builder = new ToastContentBuilder();        
 
     // Include launch string so we know what to open when user clicks toast        
+    builder.AddArgument("action", "viewForecast");        
     builder.AddArgument("zip", 98008);     
 
     // We'll always have this summary text on our toast notification        
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
index 22ed38e811b..3efea5c98d4 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml.cs
@@ -29,6 +29,7 @@ public static ToastContent GenerateToastContent()
             ToastContentBuilder builder = new ToastContentBuilder();
 
             // Include launch string so we know what to open when user clicks toast
+            builder.AddArgument("action", "viewForecast");
             builder.AddArgument("zip", 98008);
 
             // We'll always have this summary text on our toast notification
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
index d78b39202d8..67d9c4e29f5 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/App.xaml.cs
@@ -50,18 +50,21 @@ private void ToastNotificationManagerCompat_OnActivated(ToastNotificationActivat
                 int conversationId = args.GetInt("conversationId");
 
                 // If no specific action, view the conversation
-                if (!args.TryGetValue("action", out MyToastActions action))
-                {
-                    // Make sure we have a window open and in foreground
-                    OpenWindowIfNeeded();
-
-                    // And then show the conversation
-                    (Current.Windows[0] as MainWindow).ShowConversation(conversationId);
-                }
-                else
+                if (args.TryGetValue("action", out MyToastActions action))
                 {
                     switch (action)
                     {
+                        // View conversation
+                        case MyToastActions.ViewConversation:
+
+                            // Make sure we have a window open and in foreground
+                            OpenWindowIfNeeded();
+
+                            // And then show the conversation
+                            (Current.Windows[0] as MainWindow).ShowConversation(conversationId);
+
+                            break;
+
                         // Open the image
                         case MyToastActions.ViewImage:
 
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
index 49d9c9227cc..98aff66b8f1 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
@@ -36,6 +36,7 @@ private async void ButtonPopToast_Click(object sender, RoutedEventArgs e)
             new ToastContentBuilder()
 
                 // Arguments that are returned when the user clicks the toast or a button
+                .AddArgument("action", MyToastActions.ViewConversation)
                 .AddArgument("conversationId", conversationId)
 
                 // Visual content
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs
index acdaf7dc5a7..13711b8ffdf 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MyToastActions.cs
@@ -6,6 +6,11 @@ namespace Microsoft.Toolkit.Win32.WpfCore.SampleApp
 {
     public enum MyToastActions
     {
+        /// <summary>
+        /// View the conversation
+        /// </summary>
+        ViewConversation,
+
         /// <summary>
         /// Inline reply to a message
         /// </summary>

From 5c8fc1b97034c6d07a258c302349a5dfa833d0d1 Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 6 Nov 2020 16:11:15 -0800
Subject: [PATCH 45/46] ToastButton builders

---
 .../Builder/ToastContentBuilder.Actions.cs    |  98 ++----
 .../Toasts/Builder/ToastContentBuilder.cs     |  36 ++-
 .../Toasts/IToastActivateableBuilder.cs       |  94 ++++++
 .../Toasts/ToastButton.cs                     | 288 +++++++++++++++++-
 .../SamplePages/Toast/ToastCode.bind          |   3 +-
 .../MainWindow.xaml.cs                        |  23 +-
 .../TestToastContentBuilder.cs                | 218 +++++++------
 7 files changed, 570 insertions(+), 190 deletions(-)
 create mode 100644 Microsoft.Toolkit.Uwp.Notifications/Toasts/IToastActivateableBuilder.cs

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs
index 49a8818c549..32e50870076 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs
@@ -48,26 +48,6 @@ private IList<IToastInput> InputList
             }
         }
 
-        /// <summary>
-        /// Add a button to the current toast.
-        /// </summary>
-        /// <param name="content">Text to display on the button.</param>
-        /// <param name="activationType">Type of activation this button will use when clicked. Defaults to Foreground.</param>
-        /// <param name="arguments">App-defined arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
-        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-#if WINRT
-        [Windows.Foundation.Metadata.DefaultOverload]
-#endif
-        public ToastContentBuilder AddButton(string content, ToastActivationType activationType, ToastArguments arguments)
-        {
-            AddButton(content, activationType, SerializeArgumentsIncludingGeneric(arguments));
-
-            // Remove this button from the custom arguments list
-            _buttonsUsingCustomArguments.RemoveAt(_buttonsUsingCustomArguments.Count - 1);
-
-            return this;
-        }
-
         private string SerializeArgumentsIncludingGeneric(ToastArguments arguments)
         {
             if (_genericArguments.Count == 0)
@@ -86,27 +66,6 @@ private string SerializeArgumentsIncludingGeneric(ToastArguments arguments)
             return arguments.ToString();
         }
 
-        /// <summary>
-        /// Add a button to the current toast.
-        /// </summary>
-        /// <param name="content">Text to display on the button.</param>
-        /// <param name="activationType">Type of activation this button will use when clicked. Defaults to Foreground.</param>
-        /// <param name="arguments">App-defined arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
-        /// <param name="imageUri">Optional image icon for the button to display (required for buttons adjacent to inputs like quick reply).</param>
-        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-#if WINRT
-        [Windows.Foundation.Metadata.DefaultOverload]
-#endif
-        public ToastContentBuilder AddButton(string content, ToastActivationType activationType, ToastArguments arguments, Uri imageUri)
-        {
-            AddButton(content, activationType, SerializeArgumentsIncludingGeneric(arguments), imageUri);
-
-            // Remove this button from the custom arguments list
-            _buttonsUsingCustomArguments.RemoveAt(_buttonsUsingCustomArguments.Count - 1);
-
-            return this;
-        }
-
         /// <summary>
         /// Add a button to the current toast.
         /// </summary>
@@ -119,19 +78,6 @@ public ToastContentBuilder AddButton(string content, ToastActivationType activat
             return AddButton(content, activationType, arguments, default);
         }
 
-        /// <summary>
-        /// Add an button to the toast that will be display to the right of the input text box, achieving a quick reply scenario.
-        /// </summary>
-        /// <param name="textBoxId">ID of an existing <see cref="ToastTextBox"/> in order to have this button display to the right of the input, achieving a quick reply scenario.</param>
-        /// <param name="content">Text to display on the button.</param>
-        /// <param name="activationType">Type of activation this button will use when clicked. Defaults to Foreground.</param>
-        /// <param name="arguments">App-defined arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
-        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-        public ToastContentBuilder AddButton(string textBoxId, string content, ToastActivationType activationType, ToastArguments arguments)
-        {
-            return AddButton(textBoxId, content, activationType, arguments, default);
-        }
-
         /// <summary>
         /// Add a button to the current toast.
         /// </summary>
@@ -140,6 +86,9 @@ public ToastContentBuilder AddButton(string textBoxId, string content, ToastActi
         /// <param name="arguments">App-defined string of arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
         /// <param name="imageUri">Optional image icon for the button to display (required for buttons adjacent to inputs like quick reply).</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+#if WINRT
+        [Windows.Foundation.Metadata.DefaultOverload]
+#endif
         public ToastContentBuilder AddButton(string content, ToastActivationType activationType, string arguments, Uri imageUri)
         {
             // Add new button
@@ -156,28 +105,6 @@ public ToastContentBuilder AddButton(string content, ToastActivationType activat
             return AddButton(button);
         }
 
-        /// <summary>
-        /// Add an button to the toast that will be display to the right of the input text box, achieving a quick reply scenario.
-        /// </summary>
-        /// <param name="textBoxId">ID of an existing <see cref="ToastTextBox"/> in order to have this button display to the right of the input, achieving a quick reply scenario.</param>
-        /// <param name="content">Text to display on the button.</param>
-        /// <param name="activationType">Type of activation this button will use when clicked. Defaults to Foreground.</param>
-        /// <param name="arguments">App-defined arguments that the app can later retrieve once it is activated when the user clicks the button.</param>
-        /// <param name="imageUri">An optional image icon for the button to display (required for buttons adjacent to inputs like quick reply)</param>
-        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
-#if WINRT
-        [Windows.Foundation.Metadata.DefaultOverload]
-#endif
-        public ToastContentBuilder AddButton(string textBoxId, string content, ToastActivationType activationType, ToastArguments arguments, Uri imageUri)
-        {
-            AddButton(textBoxId, content, activationType, SerializeArgumentsIncludingGeneric(arguments), imageUri);
-
-            // Remove this button from the custom arguments list
-            _buttonsUsingCustomArguments.RemoveAt(_buttonsUsingCustomArguments.Count - 1);
-
-            return this;
-        }
-
         /// <summary>
         /// Add a button to the current toast.
         /// </summary>
@@ -185,19 +112,30 @@ public ToastContentBuilder AddButton(string textBoxId, string content, ToastActi
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
         public ToastContentBuilder AddButton(IToastButton button)
         {
+            if (button is ToastButton toastButton && toastButton.Content == null)
+            {
+                throw new InvalidOperationException("Content is required on button.");
+            }
+
             // List has max 5 buttons
             if (ButtonList.Count == 5)
             {
                 throw new InvalidOperationException("A toast can't have more than 5 buttons");
             }
 
-            ButtonList.Add(button);
-
-            if (button is ToastButton b)
+            if (button is ToastButton b && b.CanAddArguments())
             {
-                _buttonsUsingCustomArguments.Add(b);
+                foreach (var arg in _genericArguments)
+                {
+                    if (!b.ContainsArgument(arg.Key))
+                    {
+                        b.AddArgument(arg.Key, arg.Value);
+                    }
+                }
             }
 
+            ButtonList.Add(button);
+
             return this;
         }
 
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
index be4ed3205c4..0850a1b013d 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.cs
@@ -11,13 +11,14 @@ namespace Microsoft.Toolkit.Uwp.Notifications
     /// Builder class used to create <see cref="ToastContent"/>
     /// </summary>
     public partial class ToastContentBuilder
+#if !WINRT
+        : IToastActivateableBuilder<ToastContentBuilder>
+#endif
     {
         private Dictionary<string, string> _genericArguments = new Dictionary<string, string>();
 
         private bool _customArgumentsUsedOnToastItself;
 
-        private List<ToastButton> _buttonsUsingCustomArguments = new List<ToastButton>();
-
         /// <summary>
         /// Gets internal instance of <see cref="ToastContent"/>. This is equivalent to the call to <see cref="ToastContentBuilder.GetToastContent"/>.
         /// </summary>
@@ -196,14 +197,9 @@ private ToastContentBuilder AddArgumentHelper(string key, string value)
             {
                 foreach (var button in actions.Buttons)
                 {
-                    if (button is ToastButton b && b.ActivationType != ToastActivationType.Protocol && !_buttonsUsingCustomArguments.Contains(b))
+                    if (button is ToastButton b && b.CanAddArguments() && !b.ContainsArgument(key))
                     {
-                        var bArgs = ToastArguments.Parse(b.Arguments);
-                        if (!bArgs.Contains(key))
-                        {
-                            bArgs.Add(key, value);
-                            b.Arguments = bArgs.ToString();
-                        }
+                        b.AddArgument(key, value);
                     }
                 }
             }
@@ -243,9 +239,31 @@ private string AddArgumentHelper(string existing, string key, string value)
         /// <param name="protocol">The protocol to launch.</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
         public ToastContentBuilder SetProtocolActivation(Uri protocol)
+        {
+            return SetProtocolActivation(protocol, default);
+        }
+
+        /// <summary>
+        /// Configures the toast notification to launch the specified url when the toast body is clicked.
+        /// </summary>
+        /// <param name="protocol">The protocol to launch.</param>
+        /// <param name="targetApplicationPfn">New in Creators Update: The target PFN, so that regardless of whether multiple apps are registered to handle the same protocol uri, your desired app will always be launched.</param>
+        /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
+        public ToastContentBuilder SetProtocolActivation(Uri protocol, string targetApplicationPfn)
         {
             Content.Launch = protocol.ToString();
             Content.ActivationType = ToastActivationType.Protocol;
+
+            if (targetApplicationPfn != null)
+            {
+                if (Content.ActivationOptions == null)
+                {
+                    Content.ActivationOptions = new ToastActivationOptions();
+                }
+
+                Content.ActivationOptions.ProtocolActivationTargetApplicationPfn = targetApplicationPfn;
+            }
+
             return this;
         }
 
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/IToastActivateableBuilder.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/IToastActivateableBuilder.cs
new file mode 100644
index 00000000000..e44a9261033
--- /dev/null
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/IToastActivateableBuilder.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.Toolkit.Uwp.Notifications
+{
+    /// <summary>
+    /// Interfaces for classes that can have activation info added to them.
+    /// </summary>
+    /// <typeparam name="T">The type of the host object.</typeparam>
+    internal interface IToastActivateableBuilder<T>
+    {
+        /// <summary>
+        /// Adds a key (without value) to the activation arguments that will be returned when the content is clicked.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns>The current instance of the object.</returns>
+        T AddArgument(string key);
+
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the content is clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
+        /// <returns>The current instance of the object.</returns>
+#if WINRT
+        [Windows.Foundation.Metadata.DefaultOverload]
+#endif
+        T AddArgument(string key, string value);
+
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the content is clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
+        /// <returns>The current instance of the object.</returns>
+        T AddArgument(string key, int value);
+
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the content is clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
+        /// <returns>The current instance of the object.</returns>
+        T AddArgument(string key, double value);
+
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the content is clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
+        /// <returns>The current instance of the object.</returns>
+        T AddArgument(string key, float value);
+
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the content is clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
+        /// <returns>The current instance of the object.</returns>
+        T AddArgument(string key, bool value);
+
+#if !WINRT
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the content is clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself. Note that the enums are stored using their numeric value, so be aware that changing your enum number values might break existing activation of toasts currently in Action Center.</param>
+        /// <returns>The current instance of the object.</returns>
+        T AddArgument(string key, Enum value);
+#endif
+
+        /// <summary>
+        /// Configures the content to use background activation when it is clicked.
+        /// </summary>
+        /// <returns>The current instance of the object.</returns>
+        T SetBackgroundActivation();
+
+        /// <summary>
+        /// Configures the content to use protocol activation when it is clicked.
+        /// </summary>
+        /// <param name="protocol">The protocol to launch.</param>
+        /// <returns>The current instance of the object.</returns>
+        T SetProtocolActivation(Uri protocol);
+
+        /// <summary>
+        /// Configures the content to use protocol activation when it is clicked.
+        /// </summary>
+        /// <param name="protocol">The protocol to launch.</param>
+        /// <param name="targetApplicationPfn">New in Creators Update: The target PFN, so that regardless of whether multiple apps are registered to handle the same protocol uri, your desired app will always be launched.</param>
+        /// <returns>The current instance of the object.</returns>
+        T SetProtocolActivation(Uri protocol, string targetApplicationPfn);
+    }
+}
diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastButton.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastButton.cs
index bc9fd89b265..a564d274984 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastButton.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/ToastButton.cs
@@ -3,14 +3,23 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
     /// <summary>
     /// A button that the user can click on a Toast notification.
     /// </summary>
-    public sealed class ToastButton : IToastButton
+    public sealed class ToastButton :
+#if !WINRT
+        IToastActivateableBuilder<ToastButton>,
+#endif
+        IToastButton
     {
+        private Dictionary<string, string> _arguments = new Dictionary<string, string>();
+
+        private bool _usingCustomArguments;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ToastButton"/> class.
         /// </summary>
@@ -30,6 +39,17 @@ public ToastButton(string content, string arguments)
 
             Content = content;
             Arguments = arguments;
+
+            _usingCustomArguments = arguments.Length > 0;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ToastButton"/> class.
+        /// </summary>
+        public ToastButton()
+        {
+            // Arguments are required (we'll initialize to empty string which is fine).
+            Arguments = string.Empty;
         }
 
         /// <summary>
@@ -71,6 +91,272 @@ public ToastButton(string content, string arguments)
         /// </summary>
         public string HintActionId { get; set; }
 
+        /// <summary>
+        /// Sets the text to display on the button.
+        /// </summary>
+        /// <param name="content">The text to display on the button.</param>
+        /// <returns>The current instance of the <see cref="ToastButton"/>.</returns>
+        public ToastButton SetContent(string content)
+        {
+            Content = content;
+            return this;
+        }
+
+        /// <summary>
+        /// Adds a key (without value) to the activation arguments that will be returned when the toast notification or its buttons are clicked.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+        public ToastButton AddArgument(string key)
+        {
+            return AddArgumentHelper(key, null);
+        }
+
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the toast notification or its buttons are clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+#if WINRT
+        [Windows.Foundation.Metadata.DefaultOverload]
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("ToastButton")]
+#endif
+        public ToastButton AddArgument(string key, string value)
+        {
+            return AddArgumentHelper(key, value);
+        }
+
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the toast notification or its buttons are clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("ToastButton")]
+#endif
+        public ToastButton AddArgument(string key, int value)
+        {
+            return AddArgumentHelper(key, value.ToString());
+        }
+
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the toast notification or its buttons are clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("ToastButton")]
+#endif
+        public ToastButton AddArgument(string key, double value)
+        {
+            return AddArgumentHelper(key, value.ToString());
+        }
+
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the toast notification or its buttons are clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("ToastButton")]
+#endif
+        public ToastButton AddArgument(string key, float value)
+        {
+            return AddArgumentHelper(key, value.ToString());
+        }
+
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the toast notification or its buttons are clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself.</param>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+#if WINRT
+        [return: System.Runtime.InteropServices.WindowsRuntime.ReturnValueName("ToastButton")]
+#endif
+        public ToastButton AddArgument(string key, bool value)
+        {
+            return AddArgumentHelper(key, value ? "1" : "0"); // Encode as 1 or 0 to save string space
+        }
+
+#if !WINRT
+        /// <summary>
+        /// Adds a key/value to the activation arguments that will be returned when the toast notification or its buttons are clicked.
+        /// </summary>
+        /// <param name="key">The key for this value.</param>
+        /// <param name="value">The value itself. Note that the enums are stored using their numeric value, so be aware that changing your enum number values might break existing activation of toasts currently in Action Center.</param>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+        public ToastButton AddArgument(string key, Enum value)
+        {
+            return AddArgumentHelper(key, ((int)(object)value).ToString());
+        }
+#endif
+
+        private ToastButton AddArgumentHelper(string key, string value)
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            if (_usingCustomArguments)
+            {
+                throw new InvalidOperationException("You cannot use the AddArgument methods if you've set the Arguments property. Use the default ToastButton constructor instead.");
+            }
+
+            if (ActivationType == ToastActivationType.Protocol)
+            {
+                throw new InvalidOperationException("You cannot use the AddArgument methods when using protocol activation.");
+            }
+
+            bool alreadyExists = _arguments.ContainsKey(key);
+
+            _arguments[key] = value;
+
+            Arguments = alreadyExists ? SerializeArgumentsHelper(_arguments) : AddArgumentHelper(Arguments, key, value);
+
+            return this;
+        }
+
+        private string SerializeArgumentsHelper(IDictionary<string, string> arguments)
+        {
+            var args = new ToastArguments();
+
+            foreach (var a in arguments)
+            {
+                args.Add(a.Key, a.Value);
+            }
+
+            return args.ToString();
+        }
+
+        private string AddArgumentHelper(string existing, string key, string value)
+        {
+            string pair = ToastArguments.EncodePair(key, value);
+
+            if (string.IsNullOrEmpty(existing))
+            {
+                return pair;
+            }
+            else
+            {
+                return existing + ToastArguments.Separator + pair;
+            }
+        }
+
+        /// <summary>
+        /// Configures the button to launch the specified url when the button is clicked.
+        /// </summary>
+        /// <param name="protocol">The protocol to launch.</param>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+        public ToastButton SetProtocolActivation(Uri protocol)
+        {
+            return SetProtocolActivation(protocol, default);
+        }
+
+        /// <summary>
+        /// Configures the button to launch the specified url when the button is clicked.
+        /// </summary>
+        /// <param name="protocol">The protocol to launch.</param>
+        /// <param name="targetApplicationPfn">New in Creators Update: The target PFN, so that regardless of whether multiple apps are registered to handle the same protocol uri, your desired app will always be launched.</param>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+        public ToastButton SetProtocolActivation(Uri protocol, string targetApplicationPfn)
+        {
+            if (_arguments.Count > 0)
+            {
+                throw new InvalidOperationException("SetProtocolActivation cannot be used in conjunction with AddArgument");
+            }
+
+            Arguments = protocol.ToString();
+            ActivationType = ToastActivationType.Protocol;
+
+            if (targetApplicationPfn != null)
+            {
+                if (ActivationOptions == null)
+                {
+                    ActivationOptions = new ToastActivationOptions();
+                }
+
+                ActivationOptions.ProtocolActivationTargetApplicationPfn = targetApplicationPfn;
+            }
+
+            return this;
+        }
+
+        /// <summary>
+        /// Configures the button to use background activation when the button is clicked.
+        /// </summary>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+        public ToastButton SetBackgroundActivation()
+        {
+            ActivationType = ToastActivationType.Background;
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the behavior that the toast should use when the user invokes this button. Desktop-only, supported in builds 16251 or higher. New in Fall Creators Update.
+        /// </summary>
+        /// <param name="afterActivationBehavior">The behavior that the toast should use when the user invokes this button.</param>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+        public ToastButton SetAfterActivationBehavior(ToastAfterActivationBehavior afterActivationBehavior)
+        {
+            if (ActivationOptions == null)
+            {
+                ActivationOptions = new ToastActivationOptions();
+            }
+
+            ActivationOptions.AfterActivationBehavior = afterActivationBehavior;
+
+            return this;
+        }
+
+        /// <summary>
+        /// Sets an identifier used in telemetry to identify your category of action. This should be something like "Delete", "Reply", or "Archive". In the upcoming toast telemetry dashboard in Dev Center, you will be able to view how frequently your actions are being clicked.
+        /// </summary>
+        /// <param name="actionId">An identifier used in telemetry to identify your category of action.</param>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+        public ToastButton SetHintActionId(string actionId)
+        {
+            HintActionId = actionId;
+            return this;
+        }
+
+        /// <summary>
+        /// Sets an optional image icon for the button to display (required for buttons adjacent to inputs like quick reply).
+        /// </summary>
+        /// <param name="imageUri">An optional image icon for the button to display.</param>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+        public ToastButton SetImageUri(Uri imageUri)
+        {
+            ImageUri = imageUri.ToString();
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the ID of an existing <see cref="ToastTextBox"/> in order to have this button display to the right of the input, achieving a quick reply scenario.
+        /// </summary>
+        /// <param name="textBoxId">The ID of an existing <see cref="ToastTextBox"/>.</param>
+        /// <returns>The current instance of <see cref="ToastButton"/></returns>
+        public ToastButton SetTextBoxId(string textBoxId)
+        {
+            TextBoxId = textBoxId;
+            return this;
+        }
+
+        internal bool CanAddArguments()
+        {
+            return ActivationType != ToastActivationType.Protocol && !_usingCustomArguments;
+        }
+
+        internal bool ContainsArgument(string key)
+        {
+            return _arguments.ContainsKey(key);
+        }
+
         internal Element_ToastAction ConvertToElement()
         {
             var el = new Element_ToastAction()
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
index 9d72fed3c34..7d5a3bafa44 100644
--- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
+++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Toast/ToastCode.bind
@@ -1,7 +1,8 @@
 private void PopToast()
 {
     // Generate the toast notification content and pop the toast
-    new ToastContentBuilder().SetToastScenario(ToastScenario.Reminder)        
+    new ToastContentBuilder()
+        .SetToastScenario(ToastScenario.Reminder)        
         .AddArgument("action", "viewEvent")        
         .AddArgument("eventId", 1983)        
         .AddText("Adaptive Tiles Meeting")        
diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
index 98aff66b8f1..9f106fb59c7 100644
--- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
+++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/MainWindow.xaml.cs
@@ -49,15 +49,20 @@ private async void ButtonPopToast_Click(object sender, RoutedEventArgs e)
                 .AddInputTextBox("tbReply", "Type a reply")
 
                 // Buttons
-                .AddButton("Reply", ToastActivationType.Background, new ToastArguments()
-                    .Add("action", MyToastActions.Reply))
-
-                .AddButton("Like", ToastActivationType.Background, new ToastArguments()
-                    .Add("action", MyToastActions.Like))
-
-                .AddButton("View", ToastActivationType.Foreground, new ToastArguments()
-                    .Add("action", MyToastActions.ViewImage)
-                    .Add("imageUrl", image))
+                .AddButton(new ToastButton()
+                    .SetContent("Reply")
+                    .AddArgument("action", MyToastActions.Reply)
+                    .SetBackgroundActivation())
+
+                .AddButton(new ToastButton()
+                    .SetContent("Like")
+                    .AddArgument("action", MyToastActions.Like)
+                    .SetBackgroundActivation())
+
+                .AddButton(new ToastButton()
+                    .SetContent("View")
+                    .AddArgument("action", MyToastActions.ViewImage)
+                    .AddArgument("imageUrl", image))
 
                 // And show the toast!
                 .Show();
diff --git a/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs b/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
index 7a57a850214..74af322dee5 100644
--- a/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
+++ b/UnitTests/UnitTests.Notifications.Shared/TestToastContentBuilder.cs
@@ -150,17 +150,23 @@ public void AddArgumentTest_Generic_ReturnSelfWithArgumentsAdded()
             // Act
             ToastContentBuilder builder = new ToastContentBuilder();
             ToastContentBuilder anotherReference = builder
-                .AddButton("Accept", ToastActivationType.Background, new ToastArguments()
-                    .Add("action", "accept"))
+                .AddButton(new ToastButton()
+                    .SetContent("Accept")
+                    .AddArgument("action", "accept")
+                    .SetBackgroundActivation())
                 .AddButton(new ToastButtonSnooze())
                 .AddButton("View", ToastActivationType.Protocol, "https://msn.com")
 
                 // Add generic arguments halfway through (should be applied to existing buttons and to any subsequent buttons added later)
                 .AddArgument(userIdKey, userIdValue)
 
-                .AddButton("Decline", ToastActivationType.Background, new ToastArguments()
-                    .Add("action", "decline"))
-                .AddButton("Report", ToastActivationType.Protocol, "https://microsoft.com");
+                .AddButton(new ToastButton()
+                    .SetContent("Decline")
+                    .AddArgument("action", "decline")
+                    .SetBackgroundActivation())
+                .AddButton(new ToastButton()
+                    .SetContent("Report")
+                    .SetProtocolActivation(new Uri("https://microsoft.com")));
 
             // Assert
             Assert.AreSame(builder, anotherReference);
@@ -188,7 +194,7 @@ public void AddArgumentTest_Generic_ReturnSelfWithArgumentsAdded()
 
             var button5 = actions.Buttons[4] as ToastButton;
             Assert.AreEqual("Report", button5.Content);
-            Assert.AreEqual("https://microsoft.com", button5.Arguments);
+            Assert.AreEqual("https://microsoft.com/", button5.Arguments);
         }
 
         [TestMethod]
@@ -197,16 +203,20 @@ public void AddArgumentTest_ReplacingWithinButton_ReturnSelfWithArgumentsAdded()
             // Act
             ToastContentBuilder builder = new ToastContentBuilder();
             ToastContentBuilder anotherReference = builder
-                .AddButton("Accept", ToastActivationType.Background, new ToastArguments()
-                    .Add("action", "accept")
-                    .Add("userId", 601))
+                .AddButton(new ToastButton()
+                    .SetContent("Accept")
+                    .AddArgument("action", "accept")
+                    .AddArgument("userId", 601)
+                    .SetBackgroundActivation())
 
-                // Add generic arguments halfway through (should be applied to existing buttons and to any subsequent buttons added later)
+                // Add generic arguments halfway through (in this case shouldn't overwrite anything)
                 .AddArgument("userId", 542)
 
-                .AddButton("Decline", ToastActivationType.Background, new ToastArguments()
-                    .Add("action", "decline")
-                    .Add("userId", 601));
+                .AddButton(new ToastButton()
+                    .SetContent("Decline")
+                    .AddArgument("action", "decline")
+                    .AddArgument("userId", 601)
+                    .SetBackgroundActivation());
 
             // Assert
             Assert.AreSame(builder, anotherReference);
@@ -241,8 +251,9 @@ public void AddArgumentTest_AvoidModifyingCustomButtons_ReturnSelfWithArgumentsA
 
                 .AddButton("Decline", ToastActivationType.Background, "myDeclineStr")
 
-                .AddButton("View", ToastActivationType.Foreground, new ToastArguments()
-                    .Add("action", "view"));
+                .AddButton(new ToastButton()
+                    .SetContent("View")
+                    .AddArgument("action", "view"));
 
             // Assert
             Assert.AreSame(builder, anotherReference);
@@ -287,8 +298,10 @@ public void SetProtocolActivationTest_ReturnSelfWithArgumentsAdded()
             // Act
             ToastContentBuilder builder = new ToastContentBuilder();
             ToastContentBuilder anotherReference = builder
-                .AddButton("Accept", ToastActivationType.Background, new ToastArguments()
-                    .Add("action", "accept"))
+                .AddButton(new ToastButton()
+                    .SetContent("Accept")
+                    .AddArgument("action", "accept")
+                    .SetBackgroundActivation())
 
                 .AddArgument("userId", 542)
 
@@ -296,8 +309,10 @@ public void SetProtocolActivationTest_ReturnSelfWithArgumentsAdded()
 
                 .AddArgument("name", "Andrew")
 
-                .AddButton("Decline", ToastActivationType.Background, new ToastArguments()
-                    .Add("action", "decline"));
+                .AddButton(new ToastButton()
+                    .SetContent("Decline")
+                    .AddArgument("action", "decline")
+                    .SetBackgroundActivation());
 
             // Assert
             Assert.AreSame(builder, anotherReference);
@@ -315,6 +330,100 @@ public void SetProtocolActivationTest_ReturnSelfWithArgumentsAdded()
             Assert.AreEqual("action=decline;userId=542;name=Andrew", button2.Arguments);
         }
 
+        [TestMethod]
+        public void ToastButtonBuilders_General_ReturnSelf()
+        {
+            ToastButton button = new ToastButton();
+            ToastButton anotherReference = button
+                .SetContent("View")
+                .AddArgument("action", "view")
+                .AddArgument("imageId", 601);
+
+            Assert.AreSame(button, anotherReference);
+            Assert.AreEqual("View", button.Content);
+            Assert.AreEqual("action=view;imageId=601", button.Arguments);
+            Assert.AreEqual(ToastActivationType.Foreground, button.ActivationType);
+        }
+
+        [TestMethod]
+        public void ToastButtonBuilders_AllProperties_ReturnSelf()
+        {
+            ToastButton button = new ToastButton();
+            ToastButton anotherReference = button
+                .SetContent("View")
+                .SetImageUri(new Uri("ms-appx:///Assets/view.png"))
+                .AddArgument("action", "view")
+                .SetBackgroundActivation()
+                .SetAfterActivationBehavior(ToastAfterActivationBehavior.PendingUpdate)
+                .SetHintActionId("viewImage");
+
+            Assert.AreSame(button, anotherReference);
+            Assert.AreEqual("View", button.Content);
+            Assert.AreEqual("action=view", button.Arguments);
+            Assert.AreEqual("ms-appx:///Assets/view.png", button.ImageUri);
+            Assert.AreEqual(ToastActivationType.Background, button.ActivationType);
+            Assert.AreEqual(ToastAfterActivationBehavior.PendingUpdate, button.ActivationOptions.AfterActivationBehavior);
+            Assert.AreEqual("viewImage", button.HintActionId);
+        }
+
+        [TestMethod]
+        public void ToastButtonBuilders_ProtocolActivation_ReturnSelf()
+        {
+            ToastButton button = new ToastButton();
+            ToastButton anotherReference = button
+                .SetContent("View")
+                .SetProtocolActivation(new Uri("https://msn.com"));
+
+            Assert.AreSame(button, anotherReference);
+            Assert.AreEqual("View", button.Content);
+            Assert.AreEqual("https://msn.com/", button.Arguments);
+            Assert.AreEqual(ToastActivationType.Protocol, button.ActivationType);
+        }
+
+        [TestMethod]
+        public void ToastButtonBuilders_ProtocolActivationWithPfn_ReturnSelf()
+        {
+            ToastButton button = new ToastButton();
+            ToastButton anotherReference = button
+                .SetContent("View")
+                .SetProtocolActivation(new Uri("https://msn.com"), "MyPfn");
+
+            Assert.AreSame(button, anotherReference);
+            Assert.AreEqual("View", button.Content);
+            Assert.AreEqual("https://msn.com/", button.Arguments);
+            Assert.AreEqual(ToastActivationType.Protocol, button.ActivationType);
+            Assert.AreEqual("MyPfn", button.ActivationOptions.ProtocolActivationTargetApplicationPfn);
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void ToastButtonBuilders_InvalidProtocolAfterArguments_ReturnSelf()
+        {
+            new ToastButton()
+                .SetContent("View")
+                .AddArgument("action", "view")
+                .SetProtocolActivation(new Uri("https://msn.com"));
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void ToastButtonBuilders_InvalidArgumentsAfterProtocol_ReturnSelf()
+        {
+            new ToastButton()
+                .SetContent("View")
+                .SetProtocolActivation(new Uri("https://msn.com"))
+                .AddArgument("action", "view");
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(InvalidOperationException))]
+        public void ToastButtonBuilders_InvalidArgumentsAfterCustomArguments_ReturnSelf()
+        {
+            var button = new ToastButton("View", "viewArgs");
+
+            button.AddArgument("action", "view");
+        }
+
         [TestMethod]
         public void SetToastDurationTest_WithCustomToastDuration_ReturnSelfWithCustomToastDurationSet()
         {
@@ -780,27 +889,6 @@ public void AddButtonTest_WithTextOnlyButton_ReturnSelfWithButtonAdded()
             Assert.AreEqual(testButtonLaunchArgs, button.Arguments);
         }
 
-        [TestMethod]
-        public void AddButtonTest_WithTextOnlyButtonAndToastArguments_ReturnSelfWithButtonAdded()
-        {
-            // Arrange
-            string testButtonContent = "Test Button Content";
-            ToastActivationType testToastActivationType = ToastActivationType.Background;
-            var testButtonLaunchArgs = new ToastArguments().Add("action", "view");
-            ToastContentBuilder builder = new ToastContentBuilder();
-
-            // Act
-            ToastContentBuilder anotherReference = builder.AddButton(testButtonContent, testToastActivationType, testButtonLaunchArgs);
-
-            // Assert
-            Assert.AreSame(builder, anotherReference);
-
-            var button = (builder.Content.Actions as ToastActionsCustom).Buttons.First() as ToastButton;
-            Assert.AreEqual(testButtonContent, button.Content);
-            Assert.AreEqual(testToastActivationType, button.ActivationType);
-            Assert.AreEqual(testButtonLaunchArgs.ToString(), button.Arguments);
-        }
-
         [TestMethod]
         public void AddButtonTest_WithCustomImageAndTextButton_ReturnSelfWithButtonAdded()
         {
@@ -825,30 +913,6 @@ public void AddButtonTest_WithCustomImageAndTextButton_ReturnSelfWithButtonAdded
             Assert.AreEqual(testImageUriSrc.OriginalString, button.ImageUri);
         }
 
-        [TestMethod]
-        public void AddButtonTest_WithCustomImageAndTextButtonAndToastArguments_ReturnSelfWithButtonAdded()
-        {
-            // Arrange
-            string testButtonContent = "Test Button Content";
-            ToastActivationType testToastActivationType = ToastActivationType.Background;
-            var testButtonLaunchArgs = new ToastArguments().Add("action", "accept");
-            Uri testImageUriSrc = new Uri("C:/justatesturi.jpg");
-
-            ToastContentBuilder builder = new ToastContentBuilder();
-
-            // Act
-            ToastContentBuilder anotherReference = builder.AddButton(testButtonContent, testToastActivationType, testButtonLaunchArgs, testImageUriSrc);
-
-            // Assert
-            Assert.AreSame(builder, anotherReference);
-
-            var button = (builder.Content.Actions as ToastActionsCustom).Buttons.First() as ToastButton;
-            Assert.AreEqual(testButtonContent, button.Content);
-            Assert.AreEqual(testToastActivationType, button.ActivationType);
-            Assert.AreEqual(testButtonLaunchArgs.ToString(), button.Arguments);
-            Assert.AreEqual(testImageUriSrc.OriginalString, button.ImageUri);
-        }
-
         [TestMethod]
         public void AddButtonTest_WithTextBoxId_ReturnSelfWithButtonAdded()
         {
@@ -875,32 +939,6 @@ public void AddButtonTest_WithTextBoxId_ReturnSelfWithButtonAdded()
             Assert.AreEqual(testImageUriSrc.OriginalString, button.ImageUri);
         }
 
-        [TestMethod]
-        public void AddButtonTest_WithTextBoxIdAndToastArguments_ReturnSelfWithButtonAdded()
-        {
-            // Arrange
-            string testInputTextBoxId = Guid.NewGuid().ToString();
-            string testButtonContent = "Test Button Content";
-            ToastActivationType testToastActivationType = ToastActivationType.Background;
-            var testButtonLaunchArgs = new ToastArguments().Add("action", "send");
-            Uri testImageUriSrc = new Uri("C:/justatesturi.jpg");
-
-            ToastContentBuilder builder = new ToastContentBuilder();
-
-            // Act
-            ToastContentBuilder anotherReference = builder.AddButton(testInputTextBoxId, testButtonContent, testToastActivationType, testButtonLaunchArgs, testImageUriSrc);
-
-            // Assert
-            Assert.AreSame(builder, anotherReference);
-
-            var button = (builder.Content.Actions as ToastActionsCustom).Buttons.First() as ToastButton;
-            Assert.AreEqual(testInputTextBoxId, button.TextBoxId);
-            Assert.AreEqual(testButtonContent, button.Content);
-            Assert.AreEqual(testToastActivationType, button.ActivationType);
-            Assert.AreEqual(testButtonLaunchArgs.ToString(), button.Arguments);
-            Assert.AreEqual(testImageUriSrc.OriginalString, button.ImageUri);
-        }
-
         [TestMethod]
         public void AddInputTextBoxTest_WithStringIdOnly_ReturnSelfWithInputTextBoxAdded()
         {

From 0f1bdb41415b27f37c77cae0c1d1f6d90a9961de Mon Sep 17 00:00:00 2001
From: Andrew Leader <aleader@microsoft.com>
Date: Fri, 6 Nov 2020 16:22:15 -0800
Subject: [PATCH 46/46] Added missing header

---
 .../Toasts/IToastActivateableBuilder.cs                   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.Notifications/Toasts/IToastActivateableBuilder.cs b/Microsoft.Toolkit.Uwp.Notifications/Toasts/IToastActivateableBuilder.cs
index e44a9261033..6e62a0a7e8b 100644
--- a/Microsoft.Toolkit.Uwp.Notifications/Toasts/IToastActivateableBuilder.cs
+++ b/Microsoft.Toolkit.Uwp.Notifications/Toasts/IToastActivateableBuilder.cs
@@ -1,6 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
 
 namespace Microsoft.Toolkit.Uwp.Notifications
 {