refactor: migrate toast notifications from deprecated Microsoft.Toolkit.Uwp.Notifications to WinRT API

SysAdminDoc · SysAdminDoc · commit 0bc2e71b66e6 · 2026-06-17T10:44:15.000-04:00
diff --git a/src/DeepPurge.App/packages.lock.json b/src/DeepPurge.App/packages.lock.json
@@ -8,39 +8,6 @@
         "resolved": "8.2.2",
         "contentHash": "r0g0k9tGYdrnz8R7T3x5UiokDffeevzK/2P/9SBL6fqLgN8B157MIi/bVUWI1KAz6ZorZrK9AdABCWUeXZZsvA=="
       },
-      "Microsoft.NETCore.Platforms": {
-        "type": "Transitive",
-        "resolved": "3.1.0",
-        "contentHash": "z7aeg8oHln2CuNulfhiLYxCVMPEwBl3rzicjvIX+4sUuCwvXw5oXQEtbiU2c0z4qYL5L3Kmx0mMA/+t/SbY67w=="
-      },
-      "Microsoft.Toolkit.Uwp.Notifications": {
-        "type": "Transitive",
-        "resolved": "7.1.3",
-        "contentHash": "A1dglAzb24gjehmb7DwGd07mfyZ1gacAK7ObE0KwDlRc3mayH2QW7cSOy3TkkyELjLg19OQBuhPOj4SpXET9lg==",
-        "dependencies": {
-          "Microsoft.Win32.Registry": "4.7.0",
-          "System.Drawing.Common": "4.7.0",
-          "System.Reflection.Emit": "4.7.0",
-          "System.ValueTuple": "4.5.0"
-        }
-      },
-      "Microsoft.Win32.Registry": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==",
-        "dependencies": {
-          "System.Security.AccessControl": "4.7.0",
-          "System.Security.Principal.Windows": "4.7.0"
-        }
-      },
-      "Microsoft.Win32.SystemEvents": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "mtVirZr++rq+XCDITMUdnETD59XoeMxSpLRIII7JRI6Yj0LEDiO1pPn0ktlnIj12Ix8bfvQqQDMMIF9wC98oCA==",
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "3.1.0"
-        }
-      },
       "System.CodeDom": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -51,15 +18,6 @@
         "resolved": "8.0.1",
         "contentHash": "n1ZP7NM2Gkn/MgD8+eOT5MulMj6wfeQMNS2Pizvq5GHCZfjlFMXV2irQlQmJhwA2VABC57M0auudO89Iu2uRLg=="
       },
-      "System.Drawing.Common": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "v+XbyYHaZjDfn0ENmJEV1VYLgGgCTx1gnfOBcppowbpOAriglYgGCvFCPr2EEZyBvXlpxbEsTwkOlInl107ahA==",
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "3.1.0",
-          "Microsoft.Win32.SystemEvents": "4.7.0"
-        }
-      },
       "System.IO.Hashing": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -73,25 +31,6 @@
           "System.CodeDom": "8.0.0"
         }
       },
-      "System.Reflection.Emit": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "VR4kk8XLKebQ4MZuKuIni/7oh+QGFmZW3qORd1GvBq/8026OpW501SzT/oypwiQl4TvT8ErnReh/NzY9u+C6wQ=="
-      },
-      "System.Security.AccessControl": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "JECvTt5aFF3WT3gHpfofL2MNNP6v84sxtXxpqhLBCcDRzqsPBmHhQ6shv4DwwN2tRlzsUxtb3G9M3763rbXKDg==",
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "3.1.0",
-          "System.Security.Principal.Windows": "4.7.0"
-        }
-      },
-      "System.Security.Principal.Windows": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ=="
-      },
       "System.ServiceProcess.ServiceController": {
         "type": "Transitive",
         "resolved": "8.0.1",
@@ -100,15 +39,9 @@
           "System.Diagnostics.EventLog": "8.0.1"
         }
       },
-      "System.ValueTuple": {
-        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
-      },
       "deeppurge.core": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Toolkit.Uwp.Notifications": "[7.1.3, )",
           "System.IO.Hashing": "[8.0.0, )",
           "System.Management": "[8.0.0, )",
           "System.ServiceProcess.ServiceController": "[8.0.1, )"
diff --git a/src/DeepPurge.Cli/packages.lock.json b/src/DeepPurge.Cli/packages.lock.json
@@ -2,39 +2,6 @@
   "version": 1,
   "dependencies": {
     "net8.0-windows10.0.17763": {
-      "Microsoft.NETCore.Platforms": {
-        "type": "Transitive",
-        "resolved": "3.1.0",
-        "contentHash": "z7aeg8oHln2CuNulfhiLYxCVMPEwBl3rzicjvIX+4sUuCwvXw5oXQEtbiU2c0z4qYL5L3Kmx0mMA/+t/SbY67w=="
-      },
-      "Microsoft.Toolkit.Uwp.Notifications": {
-        "type": "Transitive",
-        "resolved": "7.1.3",
-        "contentHash": "A1dglAzb24gjehmb7DwGd07mfyZ1gacAK7ObE0KwDlRc3mayH2QW7cSOy3TkkyELjLg19OQBuhPOj4SpXET9lg==",
-        "dependencies": {
-          "Microsoft.Win32.Registry": "4.7.0",
-          "System.Drawing.Common": "4.7.0",
-          "System.Reflection.Emit": "4.7.0",
-          "System.ValueTuple": "4.5.0"
-        }
-      },
-      "Microsoft.Win32.Registry": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==",
-        "dependencies": {
-          "System.Security.AccessControl": "4.7.0",
-          "System.Security.Principal.Windows": "4.7.0"
-        }
-      },
-      "Microsoft.Win32.SystemEvents": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "mtVirZr++rq+XCDITMUdnETD59XoeMxSpLRIII7JRI6Yj0LEDiO1pPn0ktlnIj12Ix8bfvQqQDMMIF9wC98oCA==",
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "3.1.0"
-        }
-      },
       "System.CodeDom": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -45,15 +12,6 @@
         "resolved": "8.0.1",
         "contentHash": "n1ZP7NM2Gkn/MgD8+eOT5MulMj6wfeQMNS2Pizvq5GHCZfjlFMXV2irQlQmJhwA2VABC57M0auudO89Iu2uRLg=="
       },
-      "System.Drawing.Common": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "v+XbyYHaZjDfn0ENmJEV1VYLgGgCTx1gnfOBcppowbpOAriglYgGCvFCPr2EEZyBvXlpxbEsTwkOlInl107ahA==",
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "3.1.0",
-          "Microsoft.Win32.SystemEvents": "4.7.0"
-        }
-      },
       "System.IO.Hashing": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -67,25 +25,6 @@
           "System.CodeDom": "8.0.0"
         }
       },
-      "System.Reflection.Emit": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "VR4kk8XLKebQ4MZuKuIni/7oh+QGFmZW3qORd1GvBq/8026OpW501SzT/oypwiQl4TvT8ErnReh/NzY9u+C6wQ=="
-      },
-      "System.Security.AccessControl": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "JECvTt5aFF3WT3gHpfofL2MNNP6v84sxtXxpqhLBCcDRzqsPBmHhQ6shv4DwwN2tRlzsUxtb3G9M3763rbXKDg==",
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "3.1.0",
-          "System.Security.Principal.Windows": "4.7.0"
-        }
-      },
-      "System.Security.Principal.Windows": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ=="
-      },
       "System.ServiceProcess.ServiceController": {
         "type": "Transitive",
         "resolved": "8.0.1",
@@ -94,15 +33,9 @@
           "System.Diagnostics.EventLog": "8.0.1"
         }
       },
-      "System.ValueTuple": {
-        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
-      },
       "deeppurge.core": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Toolkit.Uwp.Notifications": "[7.1.3, )",
           "System.IO.Hashing": "[8.0.0, )",
           "System.Management": "[8.0.0, )",
           "System.ServiceProcess.ServiceController": "[8.0.1, )"
diff --git a/src/DeepPurge.Core/DeepPurge.Core.csproj b/src/DeepPurge.Core/DeepPurge.Core.csproj
@@ -35,8 +35,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
-    <PackageReference Include="System.Management" Version="8.0.0" />
+<PackageReference Include="System.Management" Version="8.0.0" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
     <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
   </ItemGroup>
diff --git a/src/DeepPurge.Core/Diagnostics/ToastNotifier.cs b/src/DeepPurge.Core/Diagnostics/ToastNotifier.cs
@@ -1,17 +1,28 @@
-using Microsoft.Toolkit.Uwp.Notifications;
+using Windows.Data.Xml.Dom;
+using Windows.UI.Notifications;
 
 namespace DeepPurge.Core.Diagnostics;
 
 public static class ToastNotifier
 {
+    private const string AppId = "DeepPurge";
+
     public static void Show(string title, string body)
     {
         try
         {
-            new ToastContentBuilder()
-                .AddText(title)
-                .AddText(body)
-                .Show();
+            var xml = $@"<toast>
+  <visual>
+    <binding template='ToastGeneric'>
+      <text>{EscapeXml(title)}</text>
+      <text>{EscapeXml(body)}</text>
+    </binding>
+  </visual>
+</toast>";
+            var doc = new XmlDocument();
+            doc.LoadXml(xml);
+            var toast = new ToastNotification(doc);
+            ToastNotificationManager.CreateToastNotifier(AppId).Show(toast);
         }
         catch (Exception ex)
         {
@@ -33,4 +44,7 @@ private static string FormatBytes(long bytes)
         while (b >= 1024 && i < u.Length - 1) { b /= 1024; i++; }
         return $"{b:F1} {u[i]}";
     }
+
+    private static string EscapeXml(string s) =>
+        s.Replace("&", "&amp;").Replace("<", "&lt;").Replace(">", "&gt;");
 }
diff --git a/src/DeepPurge.Core/Safety/SafetyGuard.cs b/src/DeepPurge.Core/Safety/SafetyGuard.cs
@@ -217,7 +217,6 @@ public static bool IsRegistrySymlink(Microsoft.Win32.RegistryKey key)
     {
         try
         {
-            const int REG_OPTION_OPEN_LINK = 0x00000008;
             var field = typeof(Microsoft.Win32.RegistryKey).GetField("_hkey",
                 System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
             if (field == null) return false;
diff --git a/src/DeepPurge.Core/packages.lock.json b/src/DeepPurge.Core/packages.lock.json
@@ -2,18 +2,6 @@
   "version": 1,
   "dependencies": {
     "net8.0-windows10.0.17763": {
-      "Microsoft.Toolkit.Uwp.Notifications": {
-        "type": "Direct",
-        "requested": "[7.1.3, )",
-        "resolved": "7.1.3",
-        "contentHash": "A1dglAzb24gjehmb7DwGd07mfyZ1gacAK7ObE0KwDlRc3mayH2QW7cSOy3TkkyELjLg19OQBuhPOj4SpXET9lg==",
-        "dependencies": {
-          "Microsoft.Win32.Registry": "4.7.0",
-          "System.Drawing.Common": "4.7.0",
-          "System.Reflection.Emit": "4.7.0",
-          "System.ValueTuple": "4.5.0"
-        }
-      },
       "System.IO.Hashing": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -38,28 +26,6 @@
           "System.Diagnostics.EventLog": "8.0.1"
         }
       },
-      "Microsoft.NETCore.Platforms": {
-        "type": "Transitive",
-        "resolved": "3.1.0",
-        "contentHash": "z7aeg8oHln2CuNulfhiLYxCVMPEwBl3rzicjvIX+4sUuCwvXw5oXQEtbiU2c0z4qYL5L3Kmx0mMA/+t/SbY67w=="
-      },
-      "Microsoft.Win32.Registry": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "KSrRMb5vNi0CWSGG1++id2ZOs/1QhRqROt+qgbEAdQuGjGrFcl4AOl4/exGPUYz2wUnU42nvJqon1T3U0kPXLA==",
-        "dependencies": {
-          "System.Security.AccessControl": "4.7.0",
-          "System.Security.Principal.Windows": "4.7.0"
-        }
-      },
-      "Microsoft.Win32.SystemEvents": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "mtVirZr++rq+XCDITMUdnETD59XoeMxSpLRIII7JRI6Yj0LEDiO1pPn0ktlnIj12Ix8bfvQqQDMMIF9wC98oCA==",
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "3.1.0"
-        }
-      },
       "System.CodeDom": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -69,39 +35,6 @@
         "type": "Transitive",
         "resolved": "8.0.1",
         "contentHash": "n1ZP7NM2Gkn/MgD8+eOT5MulMj6wfeQMNS2Pizvq5GHCZfjlFMXV2irQlQmJhwA2VABC57M0auudO89Iu2uRLg=="
-      },
-      "System.Drawing.Common": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "v+XbyYHaZjDfn0ENmJEV1VYLgGgCTx1gnfOBcppowbpOAriglYgGCvFCPr2EEZyBvXlpxbEsTwkOlInl107ahA==",
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "3.1.0",
-          "Microsoft.Win32.SystemEvents": "4.7.0"
-        }
-      },
-      "System.Reflection.Emit": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "VR4kk8XLKebQ4MZuKuIni/7oh+QGFmZW3qORd1GvBq/8026OpW501SzT/oypwiQl4TvT8ErnReh/NzY9u+C6wQ=="
-      },
-      "System.Security.AccessControl": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "JECvTt5aFF3WT3gHpfofL2MNNP6v84sxtXxpqhLBCcDRzqsPBmHhQ6shv4DwwN2tRlzsUxtb3G9M3763rbXKDg==",
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "3.1.0",
-          "System.Security.Principal.Windows": "4.7.0"
-        }
-      },
-      "System.Security.Principal.Windows": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "ojD0PX0XhneCsUbAZVKdb7h/70vyYMDYs85lwEI+LngEONe/17A0cFaRFqZU+sOEidcVswYWikYOQ9PPfjlbtQ=="
-      },
-      "System.ValueTuple": {
-        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
       }
     }
   }
diff --git a/tests/DeepPurge.Tests/packages.lock.json b/tests/DeepPurge.Tests/packages.lock.json

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,28 @@`
`1`		`-using Microsoft.Toolkit.Uwp.Notifications;`
	`1`	`+using Windows.Data.Xml.Dom;`
	`2`	`+using Windows.UI.Notifications;`
`2`	`3`
`3`	`4`	`namespace DeepPurge.Core.Diagnostics;`
`4`	`5`
`5`	`6`	`public static class ToastNotifier`
`6`	`7`	`{`
	`8`	`+ private const string AppId = "DeepPurge";`
	`9`	`+`
`7`	`10`	`public static void Show(string title, string body)`
`8`	`11`	`{`
`9`	`12`	`try`
`10`	`13`	`{`
`11`		`- new ToastContentBuilder()`
`12`		`- .AddText(title)`
`13`		`- .AddText(body)`
`14`		`- .Show();`
	`14`	`+ var xml = $@"<toast>`
	`15`	`+ <visual>`
	`16`	`+ <binding template='ToastGeneric'>`
	`17`	`+ <text>{EscapeXml(title)}</text>`
	`18`	`+ <text>{EscapeXml(body)}</text>`
	`19`	`+ </binding>`
	`20`	`+ </visual>`
	`21`	`+</toast>";`
	`22`	`+ var doc = new XmlDocument();`
	`23`	`+ doc.LoadXml(xml);`
	`24`	`+ var toast = new ToastNotification(doc);`
	`25`	`+ ToastNotificationManager.CreateToastNotifier(AppId).Show(toast);`
`15`	`26`	`}`
`16`	`27`	`catch (Exception ex)`
`17`	`28`	`{`
`@@ -33,4 +44,7 @@ private static string FormatBytes(long bytes)`
`33`	`44`	`while (b >= 1024 && i < u.Length - 1) { b /= 1024; i++; }`
`34`	`45`	`return $"{b:F1} {u[i]}";`
`35`	`46`	`}`
	`47`	`+`
	`48`	`+ private static string EscapeXml(string s) =>`
	`49`	`+ s.Replace("&", "&").Replace("<", "<").Replace(">", ">");`
`36`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,6 @@ public static bool IsRegistrySymlink(Microsoft.Win32.RegistryKey key)`
`217`	`217`	`{`
`218`	`218`	`try`
`219`	`219`	`{`
`220`		`- const int REG_OPTION_OPEN_LINK = 0x00000008;`
`221`	`220`	`var field = typeof(Microsoft.Win32.RegistryKey).GetField("_hkey",`
`222`	`221`	`System.Reflection.BindingFlags.NonPublic \| System.Reflection.BindingFlags.Instance);`
`223`	`222`	`if (field == null) return false;`