Remove leftover 'WINDOWS_UWP' ifdefs

Sergio0694 · Sergio0694 · commit d782f50691e5 · 2024-10-23T14:46:25.000-07:00
diff --git a/components/Notifications/src/Badges/BadgeGlyphContent.cs b/components/Notifications/src/Badges/BadgeGlyphContent.cs
@@ -3,9 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-#if WINDOWS_UWP
 using Windows.Data.Xml.Dom;
-#endif
 
 namespace CommunityToolkit.Notifications
 {
@@ -80,7 +78,6 @@ public override string ToString()
             return GetContent();
         }
 
-#if WINDOWS_UWP
         /// <summary>
         /// Retrieves the notification XML content as a WinRT Xml document.
         /// </summary>
@@ -91,8 +88,7 @@ public XmlDocument GetXml()
             xml.LoadXml(GetContent());
             return xml;
         }
-#endif
 
         private BadgeGlyphValue _glyph = (BadgeGlyphValue)(-1);
     }
-}
+}
diff --git a/components/Notifications/src/Badges/BadgeNumericContent.cs b/components/Notifications/src/Badges/BadgeNumericContent.cs
@@ -2,9 +2,7 @@
 // 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.Data.Xml.Dom;
-#endif
 
 namespace CommunityToolkit.Notifications
 {
@@ -62,7 +60,6 @@ public override string ToString()
             return GetContent();
         }
 
-#if WINDOWS_UWP
         /// <summary>
         /// Retrieves the notification Xml content as a WinRT Xml document.
         /// </summary>
@@ -73,8 +70,7 @@ public XmlDocument GetXml()
             xml.LoadXml(GetContent());
             return xml;
         }
-#endif
 
         private uint _number = 0;
     }
-}
+}
diff --git a/components/Notifications/src/Common/BaseElement.cs b/components/Notifications/src/Common/BaseElement.cs
@@ -5,9 +5,7 @@
 using System.IO;
 using System.Text;
 
-#if WINDOWS_UWP
 using Windows.Data.Xml.Dom;
-#endif
 
 namespace CommunityToolkit.Notifications
 {
@@ -40,7 +38,6 @@ public string GetContent()
             }
         }
 
-#if WINDOWS_UWP
         /// <summary>
         /// Retrieves the notification XML content as a WinRT XML document.
         /// </summary>
@@ -51,6 +48,5 @@ public XmlDocument GetXml()
             xml.LoadXml(GetContent());
             return xml;
         }
-#endif
     }
-}
+}
diff --git a/components/Notifications/src/Common/INotificationContent.cs b/components/Notifications/src/Common/INotificationContent.cs
@@ -2,9 +2,7 @@
 // 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.Data.Xml.Dom;
-#endif
 
 namespace CommunityToolkit.Notifications
 {
@@ -19,12 +17,10 @@ public interface INotificationContent
         /// <returns>The notification Xml content as a string.</returns>
         string GetContent();
 
-#if WINDOWS_UWP
         /// <summary>
         /// Retrieves the notification Xml content as a WinRT Xml document.
         /// </summary>
         /// <returns>The notification Xml content as a WinRT Xml document.</returns>
         XmlDocument GetXml();
-#endif
     }
-}
+}
diff --git a/components/Notifications/src/Common/LimitedList{T}.cs b/components/Notifications/src/Common/LimitedList{T}.cs
@@ -5,9 +5,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-#if WINDOWS_UWP
-
-#endif
 
 namespace CommunityToolkit.Notifications
 {
@@ -113,4 +110,4 @@ internal interface IElementWithDescendants
     {
         IEnumerable<object> Descendants();
     }
-}
+}
diff --git a/components/Notifications/src/Common/NotificationContentValidationException.cs b/components/Notifications/src/Common/NotificationContentValidationException.cs
@@ -3,9 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-#if WINDOWS_UWP
-
-#endif
 
 namespace CommunityToolkit.Notifications
 {
@@ -19,4 +16,4 @@ public NotificationContentValidationException(string message)
         {
         }
     }
-}
+}
diff --git a/components/Notifications/src/Tiles/TileContent.cs b/components/Notifications/src/Tiles/TileContent.cs
@@ -2,10 +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 WINDOWS_UWP
 using Windows.Data.Xml.Dom;
 using Windows.UI.Notifications;
-#endif
 
 namespace CommunityToolkit.Notifications
 {
@@ -28,7 +26,6 @@ public string GetContent()
             return ConvertToElement().GetContent();
         }
 
-#if WINDOWS_UWP
         /// <summary>
         /// Retrieves the notification XML content as a WinRT XmlDocument, so that it can be used with a local Tile notification's constructor on either <see cref="TileNotification"/> or <see cref="ScheduledTileNotification"/>.
         /// </summary>
@@ -40,7 +37,6 @@ public XmlDocument GetXml()
 
             return doc;
         }
-#endif
 
         internal Element_Tile ConvertToElement()
         {
@@ -54,4 +50,4 @@ internal Element_Tile ConvertToElement()
             return tile;
         }
     }
-}
+}
diff --git a/components/Notifications/src/Toasts/Builder/CustomizeToast.cs b/components/Notifications/src/Toasts/Builder/CustomizeToast.cs
@@ -2,8 +2,6 @@
 // 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;
 
@@ -35,5 +33,3 @@ namespace CommunityToolkit.Notifications
     /// <returns>An operation.</returns>
     public delegate IAsyncAction CustomizeScheduledToastAsync(ScheduledToastNotification toast);
 }
-
-#endif
diff --git a/components/Notifications/src/Toasts/Builder/ToastContentBuilder.Visuals.cs b/components/Notifications/src/Toasts/Builder/ToastContentBuilder.Visuals.cs
@@ -6,10 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-
-#if WINDOWS_UWP
 using Windows.UI.Notifications;
-#endif
 
 namespace CommunityToolkit.Notifications
 {
@@ -79,7 +76,6 @@ private IList<IToastBindingGenericChild> VisualChildren
             }
         }
 
-#if WINDOWS_UWP
         /// <summary>
         /// Create an instance of NotificationData that can be used to update toast that has a progress bar.
         /// </summary>
@@ -125,7 +121,6 @@ public static NotificationData CreateProgressBarData(ToastContent toast, int ind
 
             return data;
         }
-#endif
 
         /// <summary>
         /// Add an Attribution Text to be displayed on the toast.
diff --git a/components/Notifications/src/Toasts/Builder/ToastContentBuilder.cs b/components/Notifications/src/Toasts/Builder/ToastContentBuilder.cs
@@ -338,7 +338,6 @@ 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>
@@ -436,6 +435,5 @@ private async System.Threading.Tasks.Task ScheduleAsyncHelper(DateTimeOffset del
 
             ToastNotificationManagerCompat.CreateToastNotifier().AddToSchedule(notif);
         }
-#endif
     }
 }
diff --git a/components/Notifications/src/Toasts/Compat/ToastNotificationHistoryCompat.cs b/components/Notifications/src/Toasts/Compat/ToastNotificationHistoryCompat.cs
@@ -2,8 +2,6 @@
 // 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;
 
@@ -90,5 +88,3 @@ public void RemoveGroup(string group)
         }
     }
 }
-
-#endif
diff --git a/components/Notifications/src/Toasts/Compat/ToastNotificationManagerCompat.cs b/components/Notifications/src/Toasts/Compat/ToastNotificationManagerCompat.cs
@@ -2,8 +2,6 @@
 // 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;
@@ -56,5 +54,3 @@ public static bool CanUseHttpImages
         }
     }
 }
-
-#endif
diff --git a/components/Notifications/src/Toasts/Compat/ToastNotifierCompat.cs b/components/Notifications/src/Toasts/Compat/ToastNotifierCompat.cs
@@ -2,8 +2,6 @@
 // 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;
 
@@ -101,5 +99,3 @@ public NotificationSetting Setting
         }
     }
 }
-
-#endif
diff --git a/components/Notifications/src/Toasts/ToastContent.cs b/components/Notifications/src/Toasts/ToastContent.cs
@@ -4,10 +4,8 @@
 
 using System;
 using System.Collections.Generic;
-#if WINDOWS_UWP
 using Windows.Data.Xml.Dom;
 using Windows.UI.Notifications;
-#endif
 
 namespace CommunityToolkit.Notifications
 {
@@ -100,7 +98,6 @@ public string GetContent()
             return ConvertToElement().GetContent();
         }
 
-#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="ToastNotification"/> or <see cref="ScheduledToastNotification"/>.
@@ -114,8 +111,6 @@ public XmlDocument GetXml()
             return doc;
         }
 
-#endif
-
         internal Element_Toast ConvertToElement()
         {
             if (ActivationOptions != null)
@@ -189,4 +184,4 @@ private static Element_ToastActions ConvertToActionsElement(IToastActions action
             throw new NotImplementedException("Unknown actions type: " + actions.GetType());
         }
     }
-}
+}
diff --git a/components/Notifications/tests/TestAssertHelper.cs b/components/Notifications/tests/TestAssertHelper.cs
@@ -272,20 +272,14 @@ public static void AssertToast(string expected, ToastContent toast)
         {
             AssertHelper.AssertXml(expected.ToLower(), toast.GetContent().ToLower());
 
-#if WINDOWS_UWP
-            // For WinRT, we'll test the XmlDocument method too, make sure it works.
             AssertHelper.AssertXml(expected, toast.GetXml().GetXml());
-#endif
         }
 
         public static void AssertTile(string expected, TileContent tile)
         {
             AssertHelper.AssertXml(expected.ToLower(), tile.GetContent().ToLower());
 
-#if WINDOWS_UWP
-            // For WinRT, we'll test the XmlDocument method too, make sure it works.
             AssertHelper.AssertXml(expected, tile.GetXml().GetXml());
-#endif
         }
 
         public static void AssertXml(string expected, string actual)
diff --git a/components/Notifications/tests/Test_Badge_Xml.cs b/components/Notifications/tests/Test_Badge_Xml.cs
@@ -68,10 +68,7 @@ private static void AssertPayload(string expectedXml, INotificationContent notif
         {
             AssertHelper.AssertXml(expectedXml, notificationContent.GetContent());
 
-#if WINDOWS_UWP
-            // For WinRT, we'll test the XmlDocument method too, make sure it works.
             AssertHelper.AssertXml(expectedXml, notificationContent.GetXml().GetXml());
-#endif
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,7 @@`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`	`5`	`using System;`
`6`		`-#if WINDOWS_UWP`
`7`	`6`	`using Windows.Data.Xml.Dom;`
`8`		`-#endif`
`9`	`7`
`10`	`8`	`namespace CommunityToolkit.Notifications`
`11`	`9`	`{`
`@@ -80,7 +78,6 @@ public override string ToString()`
`80`	`78`	`return GetContent();`
`81`	`79`	`}`
`82`	`80`
`83`		`-#if WINDOWS_UWP`
`84`	`81`	`/// <summary>`
`85`	`82`	`/// Retrieves the notification XML content as a WinRT Xml document.`
`86`	`83`	`/// </summary>`
`@@ -91,8 +88,7 @@ public XmlDocument GetXml()`
`91`	`88`	`xml.LoadXml(GetContent());`
`92`	`89`	`return xml;`
`93`	`90`	`}`
`94`		`-#endif`
`95`	`91`
`96`	`92`	`private BadgeGlyphValue _glyph = (BadgeGlyphValue)(-1);`
`97`	`93`	`}`
`98`		`-}`
	`94`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,7 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`		`-#if WINDOWS_UWP`
`6`	`5`	`using Windows.Data.Xml.Dom;`
`7`		`-#endif`
`8`	`6`
`9`	`7`	`namespace CommunityToolkit.Notifications`
`10`	`8`	`{`
`@@ -62,7 +60,6 @@ public override string ToString()`
`62`	`60`	`return GetContent();`
`63`	`61`	`}`
`64`	`62`
`65`		`-#if WINDOWS_UWP`
`66`	`63`	`/// <summary>`
`67`	`64`	`/// Retrieves the notification Xml content as a WinRT Xml document.`
`68`	`65`	`/// </summary>`
`@@ -73,8 +70,7 @@ public XmlDocument GetXml()`
`73`	`70`	`xml.LoadXml(GetContent());`
`74`	`71`	`return xml;`
`75`	`72`	`}`
`76`		`-#endif`
`77`	`73`
`78`	`74`	`private uint _number = 0;`
`79`	`75`	`}`
`80`		`-}`
	`76`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,7 @@`
`5`	`5`	`using System.IO;`
`6`	`6`	`using System.Text;`
`7`	`7`
`8`		`-#if WINDOWS_UWP`
`9`	`8`	`using Windows.Data.Xml.Dom;`
`10`		`-#endif`
`11`	`9`
`12`	`10`	`namespace CommunityToolkit.Notifications`
`13`	`11`	`{`
`@@ -40,7 +38,6 @@ public string GetContent()`
`40`	`38`	`}`
`41`	`39`	`}`
`42`	`40`
`43`		`-#if WINDOWS_UWP`
`44`	`41`	`/// <summary>`
`45`	`42`	`/// Retrieves the notification XML content as a WinRT XML document.`
`46`	`43`	`/// </summary>`
`@@ -51,6 +48,5 @@ public XmlDocument GetXml()`
`51`	`48`	`xml.LoadXml(GetContent());`
`52`	`49`	`return xml;`
`53`	`50`	`}`
`54`		`-#endif`
`55`	`51`	`}`
`56`		`-}`
	`52`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,6 @@`
`5`	`5`	`using System;`
`6`	`6`	`using System.Collections;`
`7`	`7`	`using System.Collections.Generic;`
`8`		`-#if WINDOWS_UWP`
`9`		`-`
`10`		`-#endif`
`11`	`8`
`12`	`9`	`namespace CommunityToolkit.Notifications`
`13`	`10`	`{`
`@@ -113,4 +110,4 @@ internal interface IElementWithDescendants`
`113`	`110`	`{`
`114`	`111`	`IEnumerable<object> Descendants();`
`115`	`112`	`}`
`116`		`-}`
	`113`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,6 @@`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`	`5`	`using System;`
`6`		`-#if WINDOWS_UWP`
`7`		`-`
`8`		`-#endif`
`9`	`6`
`10`	`7`	`namespace CommunityToolkit.Notifications`
`11`	`8`	`{`
`@@ -19,4 +16,4 @@ public NotificationContentValidationException(string message)`
`19`	`16`	`{`
`20`	`17`	`}`
`21`	`18`	`}`
`22`		`-}`
	`19`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,8 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`		`-#if WINDOWS_UWP`
`6`	`5`	`using Windows.Data.Xml.Dom;`
`7`	`6`	`using Windows.UI.Notifications;`
`8`		`-#endif`
`9`	`7`
`10`	`8`	`namespace CommunityToolkit.Notifications`
`11`	`9`	`{`
`@@ -28,7 +26,6 @@ public string GetContent()`
`28`	`26`	`return ConvertToElement().GetContent();`
`29`	`27`	`}`
`30`	`28`
`31`		`-#if WINDOWS_UWP`
`32`	`29`	`/// <summary>`
`33`	`30`	`/// Retrieves the notification XML content as a WinRT XmlDocument, so that it can be used with a local Tile notification's constructor on either <see cref="TileNotification"/> or <see cref="ScheduledTileNotification"/>.`
`34`	`31`	`/// </summary>`
`@@ -40,7 +37,6 @@ public XmlDocument GetXml()`
`40`	`37`
`41`	`38`	`return doc;`
`42`	`39`	`}`
`43`		`-#endif`
`44`	`40`
`45`	`41`	`internal Element_Tile ConvertToElement()`
`46`	`42`	`{`
`@@ -54,4 +50,4 @@ internal Element_Tile ConvertToElement()`
`54`	`50`	`return tile;`
`55`	`51`	`}`
`56`	`52`	`}`
`57`		`-}`
	`53`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,7 @@`
`6`	`6`	`using System.Collections.Generic;`
`7`	`7`	`using System.Linq;`
`8`	`8`	`using System.Text;`
`9`		`-`
`10`		`-#if WINDOWS_UWP`
`11`	`9`	`using Windows.UI.Notifications;`
`12`		`-#endif`
`13`	`10`
`14`	`11`	`namespace CommunityToolkit.Notifications`
`15`	`12`	`{`
`@@ -79,7 +76,6 @@ private IList<IToastBindingGenericChild> VisualChildren`
`79`	`76`	`}`
`80`	`77`	`}`
`81`	`78`
`82`		`-#if WINDOWS_UWP`
`83`	`79`	`/// <summary>`
`84`	`80`	`/// Create an instance of NotificationData that can be used to update toast that has a progress bar.`
`85`	`81`	`/// </summary>`
`@@ -125,7 +121,6 @@ public static NotificationData CreateProgressBarData(ToastContent toast, int ind`
`125`	`121`
`126`	`122`	`return data;`
`127`	`123`	`}`
`128`		`-#endif`
`129`	`124`
`130`	`125`	`/// <summary>`
`131`	`126`	`/// Add an Attribution Text to be displayed on the toast.`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,6 @@ public ToastContent GetToastContent()`
`338`	`338`	`return Content;`
`339`	`339`	`}`
`340`	`340`
`341`		`-#if WINDOWS_UWP`
`342`	`341`	`/// <summary>`
`343`	`342`	`/// 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"/>.`
`344`	`343`	`/// </summary>`
`@@ -436,6 +435,5 @@ private async System.Threading.Tasks.Task ScheduleAsyncHelper(DateTimeOffset del`
`436`	`435`
`437`	`436`	`ToastNotificationManagerCompat.CreateToastNotifier().AddToSchedule(notif);`
`438`	`437`	`}`
`439`		`-#endif`
`440`	`438`	`}`
`441`	`439`	`}`