From a7f14c8d419bca5698c2a92e0dffac2b9df7f314 Mon Sep 17 00:00:00 2001
From: Eric Langlois <erlangl@microsoft.com>
Date: Mon, 17 Oct 2022 10:13:57 -0700
Subject: [PATCH 1/4] Updating samples to latest SDK

---
 .../CppUnpackagedAppNotifications.vcxproj     | 28 +++++++++----------
 ...UnpackagedAppNotifications.vcxproj.filters |  2 +-
 .../packages.config                           |  8 +++---
 .../CsUnpackagedAppNotifications.csproj       | 14 +++++++---
 .../MainWindow.xaml.cs                        |  3 --
 5 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj
index 88ff48e54..58a042ac6 100644
--- a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.WindowsAppSDK.1.2.220902.1-preview1\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.2.220902.1-preview1\build\native\Microsoft.WindowsAppSDK.props')" />
-  <Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.194\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.194\build\Microsoft.Windows.SDK.BuildTools.props')" />
-  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210922.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210922.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\packages\Microsoft.WindowsAppSDK.1.2.220930.4-preview2\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.2.220930.4-preview2\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.25211-preview\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.25211-preview\build\Microsoft.Windows.SDK.BuildTools.props')" />
+  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -220,21 +220,21 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210922.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210922.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.194\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.194\build\Microsoft.Windows.SDK.BuildTools.targets')" />
-    <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\packages\Microsoft.WindowsAppSDK.1.2.220902.1-preview1\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.2.220902.1-preview1\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.25211-preview\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.25211-preview\build\Microsoft.Windows.SDK.BuildTools.targets')" />
+    <Import Project="..\packages\Microsoft.WindowsAppSDK.1.2.220930.4-preview2\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.2.220930.4-preview2\build\native\Microsoft.WindowsAppSDK.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210922.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210922.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210922.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210922.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.194\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.194\build\Microsoft.Windows.SDK.BuildTools.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.194\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.194\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.2.220902.1-preview1\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.2.220902.1-preview1\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.2.220902.1-preview1\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.2.220902.1-preview1\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220929.3\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220914.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.25211-preview\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.25211-preview\build\Microsoft.Windows.SDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.25211-preview\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.25211-preview\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.2.220930.4-preview2\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.2.220930.4-preview2\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.2.220930.4-preview2\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.2.220930.4-preview2\build\native\Microsoft.WindowsAppSDK.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj.filters b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj.filters
index 071a538b2..299536593 100644
--- a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj.filters
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj.filters
@@ -80,4 +80,4 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/packages.config b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/packages.config
index 076923507..745663331 100644
--- a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/packages.config
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.210922.5" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220201.1" targetFramework="native" />
-  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22000.194" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.2.220902.1-preview1" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.220929.3" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220914.1" targetFramework="native" />
+  <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.25211-preview" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.2.220930.4-preview2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications.csproj b/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications.csproj
index e4099c53a..3d5cc1a87 100644
--- a/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications.csproj
+++ b/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
     <RootNamespace>CsUnpackagedAppNotifications</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;arm64</Platforms>
@@ -11,12 +12,17 @@
     <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
     <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
     <WindowsPackageType>None</WindowsPackageType>
+    <SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
-    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.588-beta" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.220902.1-preview1" />
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.2.63-beta">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25211-preview" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.220930.4-preview2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/MainWindow.xaml.cs b/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/MainWindow.xaml.cs
index ba2c00822..5103ef367 100644
--- a/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/MainWindow.xaml.cs
+++ b/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/MainWindow.xaml.cs
@@ -2,13 +2,10 @@
 // Licensed under the MIT License.
 
 using Microsoft.UI.Xaml;
-using System;
 using System.Runtime.InteropServices;
 using Windows.Win32.Foundation;
 using Windows.Win32.Graphics.Gdi;
-using Windows.Win32.UI.Controls;
 using Windows.Win32.UI.WindowsAndMessaging;
-using static Windows.Win32.Constants;
 using static Windows.Win32.PInvoke;
 
 namespace CsUnpackagedAppNotifications

From a044af3d3e50fd26d8d4f5f55d4c81e735b4ae80 Mon Sep 17 00:00:00 2001
From: Eric Langlois <erlangl@microsoft.com>
Date: Mon, 17 Oct 2022 10:20:23 -0700
Subject: [PATCH 2/4] Removing un-needed tag

---
 .../CsUnpackagedAppNotifications.csproj                          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications.csproj b/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications.csproj
index 3d5cc1a87..f3d598075 100644
--- a/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications.csproj
+++ b/Samples/Notifications/App/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications/CsUnpackagedAppNotifications.csproj
@@ -3,7 +3,6 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
     <RootNamespace>CsUnpackagedAppNotifications</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;arm64</Platforms>

From b390638fed834d5f7833f9bc9ed8d112c8ba16fc Mon Sep 17 00:00:00 2001
From: Eric Langlois <erlangl@microsoft.com>
Date: Mon, 24 Oct 2022 13:58:05 -0700
Subject: [PATCH 3/4] New scenario to showcase push / toast mixed scenarios

---
 .../CppUnpackagedAppNotifications.vcxproj     |  9 ++++
 ...UnpackagedAppNotifications.vcxproj.filters | 10 ++++
 .../Notifications/PushToastWithAvatar.cpp     | 47 +++++++++++++++++++
 .../Notifications/PushToastWithAvatar.h       | 15 ++++++
 .../CppUnpackagedAppNotifications/Project.idl | 10 +++-
 .../SampleConfiguration.cpp                   |  4 +-
 .../Scenario3_PushToastWithAvatar.xaml        | 32 +++++++++++++
 .../Scenario3_PushToastWithAvatar.xaml.cpp    | 41 ++++++++++++++++
 .../Scenario3_PushToastWithAvatar.xaml.h      | 27 +++++++++++
 9 files changed, 192 insertions(+), 3 deletions(-)
 create mode 100644 Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.cpp
 create mode 100644 Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.h
 create mode 100644 Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Scenario3_PushToastWithAvatar.xaml
 create mode 100644 Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Scenario3_PushToastWithAvatar.xaml.cpp
 create mode 100644 Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Scenario3_PushToastWithAvatar.xaml.h

diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj
index 58a042ac6..0b98bc472 100644
--- a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj
@@ -120,6 +120,7 @@
     </ClInclude>
     <ClInclude Include="Notifications\Common.h" />
     <ClInclude Include="Notifications\NotificationManager.h" />
+    <ClInclude Include="Notifications\PushToastWithAvatar.h" />
     <ClInclude Include="Notifications\ToastWithAvatar.h" />
     <ClInclude Include="Notifications\ToastWithTextBox.h" />
     <ClInclude Include="NotifyUser.h" />
@@ -139,6 +140,9 @@
       <DependentUpon>Scenario2_ToastWithTextBox.xaml</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
+    <ClInclude Include="Scenario3_PushToastWithAvatar.xaml.h">
+      <DependentUpon>Scenario3_PushToastWithAvatar.xaml</DependentUpon>
+    </ClInclude>
     <ClInclude Include="SettingsPage.xaml.h">
       <DependentUpon>SettingsPage.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -156,6 +160,7 @@
     <Page Include="Scenario2_ToastWithTextBox.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Scenario3_PushToastWithAvatar.xaml" />
     <Page Include="SettingsPage.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -169,6 +174,7 @@
       <SubType>Code</SubType>
     </ClCompile>
     <ClCompile Include="Notifications\NotificationManager.cpp" />
+    <ClCompile Include="Notifications\PushToastWithAvatar.cpp" />
     <ClCompile Include="Notifications\ToastWithAvatar.cpp" />
     <ClCompile Include="Notifications\ToastWithTextBox.cpp" />
     <ClCompile Include="NotifyUser.cpp" />
@@ -191,6 +197,9 @@
       <DependentUpon>Scenario2_ToastWithTextBox.xaml</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
+    <ClCompile Include="Scenario3_PushToastWithAvatar.xaml.cpp">
+      <DependentUpon>Scenario3_PushToastWithAvatar.xaml</DependentUpon>
+    </ClCompile>
     <ClCompile Include="SettingsPage.xaml.cpp">
       <DependentUpon>SettingsPage.xaml</DependentUpon>
       <SubType>Code</SubType>
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj.filters b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj.filters
index 299536593..b88b277e2 100644
--- a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj.filters
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications.vcxproj.filters
@@ -10,6 +10,7 @@
     <Page Include="Scenario1_ToastWithAvatar.xaml" />
     <Page Include="Scenario2_ToastWithTextBox.xaml" />
     <Page Include="Styles.xaml" />
+    <Page Include="Scenario3_PushToastWithAvatar.xaml" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="Project.idl" />
@@ -28,6 +29,9 @@
     <ClCompile Include="Notifications\ToastWithTextBox.cpp">
       <Filter>Notifications</Filter>
     </ClCompile>
+    <ClCompile Include="Notifications\PushToastWithAvatar.cpp">
+      <Filter>Notifications</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -45,6 +49,9 @@
     <ClInclude Include="Notifications\ToastWithTextBox.h">
       <Filter>Notifications</Filter>
     </ClInclude>
+    <ClInclude Include="Notifications\PushToastWithAvatar.h">
+      <Filter>Notifications</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="Assets\Wide310x150Logo.png">
@@ -80,4 +87,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.cpp b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.cpp
new file mode 100644
index 000000000..1b3e4164e
--- /dev/null
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.cpp
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "PushToastWithAvatar.h"
+#include "Common.h"
+#include <winrt/Microsoft.Windows.AppNotifications.h>
+#include <winrt/Microsoft.Windows.AppNotifications.Builder.h>
+#include <winrt/Windows.Foundation.h>
+#include "App.xaml.h"
+#include "MainPage.xaml.h"
+
+namespace winrt
+{
+    using namespace Microsoft::Windows::AppNotifications;
+    using namespace Microsoft::Windows::AppNotifications::Builder;
+    using namespace CppUnpackagedAppNotifications::implementation;
+}
+
+const wchar_t* PushToastWithAvatar::ScenarioName{ L"Push / Local Toast with Avatar Image" };
+
+bool PushToastWithAvatar::SendToast()
+{
+    auto appNotification{ winrt::AppNotificationBuilder()
+        .AddArgument(L"action", L"ToastClick")
+        .AddArgument(Common::scenarioTag, std::to_wstring(PushToastWithAvatar::ScenarioId))
+        .SetAppLogoOverride(winrt::Windows::Foundation::Uri(L"file://" + winrt::App::GetFullPathToAsset(L"Square150x150Logo.png")), winrt::AppNotificationImageCrop::Circle)
+        .AddText(ScenarioName)
+        .AddText(L"This is an example message using XML")
+        .AddButton(winrt::AppNotificationButton(L"Open App")
+            .AddArgument(L"action", L"OpenApp")
+            .AddArgument(Common::scenarioTag, std::to_wstring(PushToastWithAvatar::ScenarioId)))
+        .BuildNotification() };
+
+    winrt::AppNotificationManager::Default().Show(appNotification);
+
+    return appNotification.Id() != 0; // return true (indicating success) if the toast was sent (if it has an Id)
+}
+
+void PushToastWithAvatar::NotificationReceived(winrt::Microsoft::Windows::AppNotifications::AppNotificationActivatedEventArgs const& notificationActivatedEventArgs)
+{
+    winrt::CppUnpackagedAppNotifications::Notification notification{};
+    notification.Originator = ScenarioName;
+    notification.Action = notificationActivatedEventArgs.Arguments().Lookup(L"action");
+    winrt::MainPage::Current().NotificationReceived(notification);
+    winrt::App::ToForeground();
+}
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.h b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.h
new file mode 100644
index 000000000..18e1c2972
--- /dev/null
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.h
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+#include <winrt/Microsoft.Windows.AppNotifications.h>
+
+struct PushToastWithAvatar
+{
+public:
+    static const unsigned ScenarioId{ 1 };
+    static const wchar_t* ScenarioName;
+
+    static bool SendToast();
+    static void NotificationReceived(winrt::Microsoft::Windows::AppNotifications::AppNotificationActivatedEventArgs const& notificationActivatedEventArgs);
+};
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Project.idl b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Project.idl
index e83ce07b8..66ab7b8e8 100644
--- a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Project.idl
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Project.idl
@@ -26,8 +26,14 @@ namespace CppUnpackagedAppNotifications
         Scenario2_ToastWithTextBox();
     }
 
-     /* The following code is template-specific IDL.
-     These runtime classes are the same across all C++/WinRT WinUI samples. */
+    [default_interface]
+    runtimeclass Scenario3_PushToastWithAvatar : Microsoft.UI.Xaml.Controls.Page
+    {
+        Scenario3_PushToastWithAvatar();
+    }
+
+    /* The following code is template-specific IDL.
+    These runtime classes are the same across all C++/WinRT WinUI samples. */
 
     runtimeclass MainPage : Microsoft.UI.Xaml.Controls.Page
     {
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/SampleConfiguration.cpp b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/SampleConfiguration.cpp
index d619ac12f..ca1a33c65 100644
--- a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/SampleConfiguration.cpp
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/SampleConfiguration.cpp
@@ -7,6 +7,7 @@
 #include "MainPage.xaml.h"
 #include "Notifications\ToastWithAvatar.h"
 #include "Notifications\ToastWithTextBox.h"
+#include "Notifications\PushToastWithAvatar.h"
 
 namespace winrt
 {
@@ -19,7 +20,8 @@ namespace winrt::CppUnpackagedAppNotifications
     IVector<Scenario> implementation::MainPage::scenariosInner = single_threaded_observable_vector<Scenario>(
         {
             Scenario{ ToastWithAvatar::ScenarioName, hstring(name_of<CppUnpackagedAppNotifications::Scenario1_ToastWithAvatar>())},
-            Scenario{ ToastWithTextBox::ScenarioName, hstring(name_of<CppUnpackagedAppNotifications::Scenario2_ToastWithTextBox>())}
+            Scenario{ ToastWithTextBox::ScenarioName, hstring(name_of<CppUnpackagedAppNotifications::Scenario2_ToastWithTextBox>())},
+            Scenario{ PushToastWithAvatar::ScenarioName, hstring(name_of<CppUnpackagedAppNotifications::Scenario3_PushToastWithAvatar>())}
         });
 
     hstring SampleConfig::FeatureName{ L"CppUnpackagedAppNotifications" };
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Scenario3_PushToastWithAvatar.xaml b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Scenario3_PushToastWithAvatar.xaml
new file mode 100644
index 000000000..0666aa874
--- /dev/null
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Scenario3_PushToastWithAvatar.xaml
@@ -0,0 +1,32 @@
+<!-- Copyright (c) Microsoft Corporation.
+     Licensed under the MIT License. -->
+<Page
+    x:Class="CppUnpackagedAppNotifications.Scenario3_PushToastWithAvatar"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:CppUnpackagedAppNotifications"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="auto"/>
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0" Spacing="10" Margin="10,10,10,10">
+            <TextBlock Text="Description:" Style="{StaticResource SampleHeaderTextStyle}"/>
+
+            <TextBlock Style="{StaticResource ScenarioDescriptionTextStyle}" TextWrapping="Wrap">
+                This example demonstrates using a raw XML payload to produce a local toast notification with an avatar image and activation.
+            </TextBlock>
+
+            <Button Content="Send Toast" Click="SendToast_Click"/>
+        </StackPanel>
+
+        <TextBlock Grid.Row="1" Style="{StaticResource ScenarioDescriptionTextStyle}" TextWrapping="Wrap">
+                Find more information on sending a toast notification at
+                <Hyperlink NavigateUri="https://docs.microsoft.com/windows/apps/design/shell/tiles-and-notifications/adaptive-interactive-toasts?tabs=xml">Toast content | Microsoft Docs</Hyperlink>
+        </TextBlock>
+    </Grid>
+</Page>
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Scenario3_PushToastWithAvatar.xaml.cpp b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Scenario3_PushToastWithAvatar.xaml.cpp
new file mode 100644
index 000000000..b969c49a6
--- /dev/null
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Scenario3_PushToastWithAvatar.xaml.cpp
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include <winrt/Microsoft.Windows.AppNotifications.h>
+#include "Scenario3_PushToastWithAvatar.xaml.h"
+#if __has_include("Scenario3_PushToastWithAvatar.g.cpp")
+#include "Scenario3_PushToastWithAvatar.g.cpp"
+#endif
+#include "NotifyUser.h"
+#include "Notifications\ToastWithAvatar.h"
+
+namespace winrt
+{
+    using namespace Microsoft::UI::Xaml;
+    using namespace Microsoft::Windows::AppNotifications;
+}
+
+namespace winrt::CppUnpackagedAppNotifications::implementation
+{
+    MainPage Scenario3_PushToastWithAvatar::rootPage{ nullptr };
+
+    Scenario3_PushToastWithAvatar::Scenario3_PushToastWithAvatar()
+    {
+        InitializeComponent();
+
+        Scenario3_PushToastWithAvatar::rootPage = MainPage::Current();
+    }
+
+    void Scenario3_PushToastWithAvatar::SendToast_Click(IInspectable const&, RoutedEventArgs const&)
+    {
+        if (ToastWithAvatar::SendToast())
+        {
+            NotifyUser::ToastSentSuccessfully();
+        }
+        else
+        {
+            NotifyUser::CouldNotSendToast();
+        }
+    }
+}
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Scenario3_PushToastWithAvatar.xaml.h b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Scenario3_PushToastWithAvatar.xaml.h
new file mode 100644
index 000000000..07000e4f7
--- /dev/null
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Scenario3_PushToastWithAvatar.xaml.h
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "Scenario3_PushToastWithAvatar.g.h"
+#include <winrt/Microsoft.Windows.AppNotifications.h>
+
+namespace winrt::CppUnpackagedAppNotifications::implementation
+{
+    struct Scenario3_PushToastWithAvatar : Scenario3_PushToastWithAvatarT<Scenario3_PushToastWithAvatar>
+    {
+        Scenario3_PushToastWithAvatar();
+
+        void SendToast_Click(winrt::Windows::Foundation::IInspectable const&, winrt::Microsoft::UI::Xaml::RoutedEventArgs const&);
+
+    private:
+        static CppUnpackagedAppNotifications::MainPage rootPage;
+    };
+}
+
+namespace winrt::CppUnpackagedAppNotifications::factory_implementation
+{
+    struct Scenario3_PushToastWithAvatar : Scenario3_PushToastWithAvatarT<Scenario3_PushToastWithAvatar, implementation::Scenario3_PushToastWithAvatar>
+    {
+    };
+}

From 78800e93d191aa2996d7a10cf22603865caba74b Mon Sep 17 00:00:00 2001
From: Eric Langlois <erlangl@microsoft.com>
Date: Tue, 25 Oct 2022 19:21:10 -0700
Subject: [PATCH 4/4] Adding code to handle push notifications

---
 .../App.xaml.cpp                              | 37 +++++++++--
 .../Notifications/NotificationManager.cpp     | 33 +++++++++-
 .../Notifications/NotificationManager.h       |  2 +
 .../Notifications/PushToastWithAvatar.cpp     | 65 +++++++++++++++++++
 .../Notifications/PushToastWithAvatar.h       |  5 ++
 5 files changed, 136 insertions(+), 6 deletions(-)

diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/App.xaml.cpp b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/App.xaml.cpp
index b709860c2..77a8302ce 100644
--- a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/App.xaml.cpp
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/App.xaml.cpp
@@ -9,13 +9,15 @@
 #include <Microsoft.UI.Xaml.Window.h>
 #include <winrt/Microsoft.Windows.AppLifecycle.h>
 #include <winrt/Microsoft.Windows.AppNotifications.h>
+#include <winrt/Windows.ApplicationModel.Background.h>
 
 namespace winrt
 {
     using namespace Windows::Foundation;
     using namespace Microsoft::UI::Xaml;
-    using namespace winrt::Microsoft::Windows::AppLifecycle;
-    using namespace winrt::Microsoft::Windows::AppNotifications;
+    using namespace Microsoft::Windows::AppLifecycle;
+    using namespace Microsoft::Windows::AppNotifications;
+    using namespace Microsoft::Windows::PushNotifications;
 }
 
 // NotificationManager is responsible for registering and unregistering the Sample for App Notifications as well as
@@ -87,12 +89,39 @@ namespace winrt::CppUnpackagedAppNotifications::implementation
             winrt::AppActivationArguments activationArgs{ currentInstance.GetActivatedEventArgs() };
             if (activationArgs)
             {
-                winrt::ExtendedActivationKind extendedKind{ activationArgs.Kind() };
-                if (extendedKind == winrt::Microsoft::Windows::AppLifecycle::ExtendedActivationKind::AppNotification)
+                switch (activationArgs.Kind())
+                {
+                    // When it is activated from a push notification, the sample only displays the notification.
+                    // It doesn’t register for foreground activation of perform any other actions
+                    // because background activation is meant to let app perform only small tasks in order to preserve battery life.
+                case ExtendedActivationKind::Push:
+                {
+                    winrt::PushNotificationReceivedEventArgs pushArgs{ activationArgs.Data().as<winrt::PushNotificationReceivedEventArgs>() };
+
+                    // Call GetDeferral to ensure that code runs in low power
+                    auto deferral{ pushArgs.GetDeferral() };
+
+                    auto payload{ pushArgs.Payload() };
+
+                    // Do stuff to process the raw notification payload
+                    std::string payloadString(payload.begin(), payload.end());
+                    //std::cout << "\nPush notification content received in the BACKGROUND: " << payloadString.c_str() << std::endl;
+                    //std::cout << "\nPress 'Enter' to exit the App." << std::endl;
+
+                    // Call Complete on the deferral when finished processing the payload.
+                    // This removes the override that kept the app running even when the system was in a low power mode.
+                    deferral.Complete();
+                    //std::cin.ignore();
+                }
+                break;
+
+                case winrt::Microsoft::Windows::AppLifecycle::ExtendedActivationKind::AppNotification:
                 {
                     winrt::AppNotificationActivatedEventArgs notificationActivatedEventArgs{ activationArgs.Data().as<winrt::AppNotificationActivatedEventArgs>() };
                     g_notificationManager.ProcessLaunchActivationArgs(notificationActivatedEventArgs);
                 }
+                break;
+                }
             }
         }
 
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/NotificationManager.cpp b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/NotificationManager.cpp
index eb953137a..0ee494286 100644
--- a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/NotificationManager.cpp
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/NotificationManager.cpp
@@ -17,6 +17,7 @@ namespace winrt
 {
     using namespace Microsoft::UI::Xaml::Controls;
     using namespace Microsoft::Windows::AppNotifications;
+    using namespace Microsoft::Windows::PushNotifications;
     using namespace CppUnpackagedAppNotifications::implementation;
 }
 
@@ -39,12 +40,29 @@ NotificationManager::~NotificationManager()
 
 void NotificationManager::Init()
 {
-    auto notificationManager{ winrt::AppNotificationManager::Default() };
+    auto pushNotificationManager = winrt::PushNotificationManager::Default();
+
+    if (pushNotificationManager.IsSupported())
+    {
+        // Setup an event handler, so we can receive notifications in the foreground while the app is running.
+        SubscribeForegroundEventHandler();
+
+        pushNotificationManager.Register();
+    }
+    else
+    {
+        // Here, the app should handle the case where push notifications are not supported, for example:
+        // - maintain its own persistent connection with an App Service or
+        // - use polling over a scheduled interval to synchronize the client.
+        //std::cout << "\nPush Notifications aren't supported." << std::endl;
+    }
+
+    auto appNotificationManager{ winrt::AppNotificationManager::Default() };
 
     // To ensure all Notification handling happens in this process instance, register for
     // NotificationInvoked before calling Register(). Without this a new process will
     // be launched to handle the notification.
-    const auto token{ notificationManager.NotificationInvoked([&](const auto&, winrt::AppNotificationActivatedEventArgs  const& notificationActivatedEventArgs)
+    const auto token{ appNotificationManager.NotificationInvoked([&](const auto&, winrt::AppNotificationActivatedEventArgs  const& notificationActivatedEventArgs)
         {
             NotifyUser::NotificationReceived();
 
@@ -84,3 +102,14 @@ bool NotificationManager::DispatchNotification(winrt::AppNotificationActivatedEv
         return false; // No scenario specified in the notification
     }
 }
+
+void NotificationManager::SubscribeForegroundEventHandler()
+{
+    winrt::event_token token{ winrt::PushNotificationManager::Default().PushReceived([](auto const&, winrt::PushNotificationReceivedEventArgs const& args)
+    {
+        auto payload{ args.Payload() };
+
+        std::string payloadString(payload.begin(), payload.end());
+        //std::cout << "\nPush notification content received in the FOREGROUND: " << payloadString << std::endl;
+    }) };
+}
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/NotificationManager.h b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/NotificationManager.h
index f0ea77b74..d646dc711 100644
--- a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/NotificationManager.h
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/NotificationManager.h
@@ -3,6 +3,7 @@
 
 #pragma once
 #include <winrt/Microsoft.Windows.AppNotifications.h>
+#include <winrt/Microsoft.Windows.PushNotifications.h>
 
 class NotificationManager
 {
@@ -15,6 +16,7 @@ class NotificationManager
 
  private:
      bool DispatchNotification(winrt::Microsoft::Windows::AppNotifications::AppNotificationActivatedEventArgs const& notificationActivatedEventArgs);
+     void SubscribeForegroundEventHandler();
 
      bool m_isRegistered;
 };
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.cpp b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.cpp
index 1b3e4164e..0faa1d7e4 100644
--- a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.cpp
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.cpp
@@ -14,11 +14,17 @@ namespace winrt
 {
     using namespace Microsoft::Windows::AppNotifications;
     using namespace Microsoft::Windows::AppNotifications::Builder;
+    using namespace Microsoft::Windows::PushNotifications;
+    using namespace Windows::Foundation;
     using namespace CppUnpackagedAppNotifications::implementation;
 }
 
 const wchar_t* PushToastWithAvatar::ScenarioName{ L"Push / Local Toast with Avatar Image" };
 
+// To obtain your Azure AppId, follow "Configure your app's identity in Azure Active Directory
+// at https://docs.microsoft.com/en-us/windows/apps/windows-app-sdk/notifications/push/push-quickstart
+const winrt::guid PushToastWithAvatar::RemoteId{ "00000000-0000-0000-0000-000000000000" }; // Replace this with your own Azure AppId
+
 bool PushToastWithAvatar::SendToast()
 {
     auto appNotification{ winrt::AppNotificationBuilder()
@@ -45,3 +51,62 @@ void PushToastWithAvatar::NotificationReceived(winrt::Microsoft::Windows::AppNot
     winrt::MainPage::Current().NotificationReceived(notification);
     winrt::App::ToForeground();
 }
+
+winrt::Microsoft::Windows::PushNotifications::PushNotificationChannel PushToastWithAvatar::RequestChannel()
+{
+    auto task{ RequestChannelAsync() };
+    if (task.wait_for(std::chrono::minutes(5)) != winrt::AsyncStatus::Completed)
+    {
+        task.Cancel();
+        return nullptr;
+    }
+
+    auto result{ task.GetResults() };
+    return result;
+}
+
+winrt::Windows::Foundation::IAsyncOperation<winrt::PushNotificationChannel> PushToastWithAvatar::RequestChannelAsync()
+{
+    auto channelOperation{ winrt::PushNotificationManager::Default().CreateChannelAsync(RemoteId) };
+
+    // Setup the in-progress event handler
+    channelOperation.Progress(
+        [](auto&& /*sender*/, auto&& args)
+        {
+            if (args.status == winrt::PushNotificationChannelStatus::InProgress)
+            {
+                // This is basically a noop since it isn't really an error state
+                //std::cout << "\nWNS Channel URI request is in progress." << std::endl;
+            }
+            else if (args.status == winrt::PushNotificationChannelStatus::InProgressRetry)
+            {
+                //LOG_HR_MSG(
+                //    args.extendedError,
+                //    "The WNS Channel URI request is in back-off retry mode because of a retryable error! Expect delays in acquiring it. RetryCount = %d",
+                //    args.retryCount);
+            }
+        });
+
+    auto result{ co_await channelOperation };
+
+    if (result.Status() == winrt::PushNotificationChannelStatus::CompletedSuccess)
+    {
+        auto channel{ result.Channel() };
+
+        //std::cout << "\nWNS Channel URI: " << winrt::to_string(channel.Uri().ToString()) << std::endl;
+
+        // It's the caller's responsibility to keep the channel alive
+        co_return channel;
+    }
+    else if (result.Status() == winrt::PushNotificationChannelStatus::CompletedFailure)
+    {
+        //LOG_HR_MSG(result.ExtendedError(), "We hit a critical non-retryable error with the WNS Channel URI request!");
+        co_return nullptr;
+    }
+    else
+    {
+        //LOG_HR_MSG(result.ExtendedError(), "Some other failure occurred.");
+        co_return nullptr;
+    }
+
+};
diff --git a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.h b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.h
index 18e1c2972..add74e75a 100644
--- a/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.h
+++ b/Samples/Notifications/App/CppUnpackagedAppNotifications/CppUnpackagedAppNotifications/Notifications/PushToastWithAvatar.h
@@ -3,6 +3,7 @@
 
 #pragma once
 #include <winrt/Microsoft.Windows.AppNotifications.h>
+#include <winrt/Microsoft.Windows.PushNotifications.h>
 
 struct PushToastWithAvatar
 {
@@ -10,6 +11,10 @@ struct PushToastWithAvatar
     static const unsigned ScenarioId{ 1 };
     static const wchar_t* ScenarioName;
 
+    static const winrt::guid RemoteId;
+
     static bool SendToast();
     static void NotificationReceived(winrt::Microsoft::Windows::AppNotifications::AppNotificationActivatedEventArgs const& notificationActivatedEventArgs);
+    static winrt::Microsoft::Windows::PushNotifications::PushNotificationChannel RequestChannel();
+    static winrt::Windows::Foundation::IAsyncOperation<winrt::Microsoft::Windows::PushNotifications::PushNotificationChannel> RequestChannelAsync();
 };