Standartization of Core.UWP project file for NET8 WinUI

Wino.Core.UWP/Services/KeyPressService.cs

@@ -1,8 +1,15 @@
-using Windows.System;
+
+using Windows.System;
 using Windows.UI.Core;
-using Windows.UI.Xaml;
+
 using Wino.Core.Domain.Interfaces;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml;
+#endif
+
 namespace Wino.Core.UWP.Services
 {
     public class KeyPressService : IKeyPressService

Wino.Core.UWP/Services/NativeAppService.cs

@@ -9,11 +9,17 @@ using Windows.Storage;
 using Windows.Storage.Streams;
 using Windows.System;
 using Windows.UI.Shell;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Authorization;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
 namespace Wino.Services
 {
     public class NativeAppService : INativeAppService
@@ -100,7 +106,7 @@ namespace Wino.Services
             await Launcher.LaunchFileAsync(file);
         }
 
-        public Task LaunchUriAsync(Uri uri) => Xamarin.Essentials.Launcher.OpenAsync(uri);
+        public Task LaunchUriAsync(Uri uri) => Launcher.LaunchUriAsync(uri).AsTask();
 
         public string GetFullAppVersion()
         {

Wino.Core.UWP/Services/NotificationBuilder.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Uwp.Notifications;
 using Windows.Data.Xml.Dom;
 using Windows.UI.Notifications;
 using Wino.Core.Domain;
@@ -12,6 +11,12 @@ using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Services;
 
+#if NET8_0
+using CommunityToolkit.WinUI.Notifications;
+#else
+using Microsoft.Toolkit.Uwp.Notifications;
+#endif
+
 namespace Wino.Core.UWP.Services
 {
     // TODO: Refactor this thing. It's garbage.

Wino.Core.UWP/Services/ThemeService.cs

@@ -6,15 +6,12 @@ using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Toolkit.Uwp.Helpers;
+
 using Newtonsoft.Json;
 using Windows.Storage;
-using Windows.UI;
+
 using Windows.UI.ViewManagement;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Markup;
-using Windows.UI.Xaml.Media;
+
 using Wino.Core.Domain;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Exceptions;
@@ -25,6 +22,22 @@ using Wino.Core.UWP.Extensions;
 using Wino.Core.UWP.Models.Personalization;
 using Wino.Core.UWP.Services;
 
+#if NET8_0
+using Microsoft.UI.Xaml.Controls;
+using CommunityToolkit.WinUI.Helpers;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Markup;
+using Microsoft.UI;
+#else
+using Windows.UI;
+using Windows.UI.Xaml.Controls;
+using Microsoft.Toolkit.Uwp.Helpers;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Markup;
+
+#endif
 namespace Wino.Services
 {
     /// <summary>
@@ -226,7 +239,11 @@ namespace Wino.Services
             // Change accent color if specified.
             if (!string.IsNullOrEmpty(hex))
             {
+#if NET8_0
+                var brush = new SolidColorBrush(CommunityToolkit.WinUI.Helpers.ColorHelper.ToColor(hex));
+#else
                 var brush = new SolidColorBrush(Microsoft.Toolkit.Uwp.Helpers.ColorHelper.ToColor(hex));
+#endif
 
                 if (_applicationResourceManager.ContainsResourceKey("SystemAccentColor"))
                     _applicationResourceManager.ReplaceResource("SystemAccentColor", brush);

Wino.Core.UWP/Services/UnderlyingThemeService.cs

@@ -1,7 +1,12 @@
 using Windows.UI.ViewManagement;
-using Windows.UI.Xaml;
 using Wino.Core.Domain.Interfaces;
 
+#if NET8_0
+using Microsoft.UI.Xaml;
+#else
+using Windows.UI.Xaml;
+#endif
+
 namespace Wino.Core.UWP.Services
 {
     public class UnderlyingThemeService : IUnderlyingThemeService