Update depencencies

WOA-Project · Dec 9, 2023 · 823cdac · 823cdac
1 parent 0b73250
commit 823cdac
Show file tree

Hide file tree

Showing 31 changed files with 469 additions and 452 deletions.
diff --git a/App.xaml.cs b/App.xaml.cs
@@ -1,38 +1,40 @@
 using Chat.ContentDialogs;
+using System;
+using System.Globalization;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.UI.Xaml;
-using System;
-using System.Globalization;
 
 namespace Chat
 {
-    sealed partial class App : Application
+    public sealed partial class App : Application
     {
         public App()
         {
-            this.InitializeComponent();
-            this.Suspending += OnSuspending;
-            this.UnhandledException += App_UnhandledException;
+            InitializeComponent();
+            Suspending += OnSuspending;
+            UnhandledException += App_UnhandledException;
         }
 
         private async void App_UnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
         {
             e.Handled = true;
             string ExceptionDesc = e.Exception.Message + "\nHRESULT: 0x" + e.Exception.HResult.ToString("X4", new CultureInfo("en-US")) + "\n" + e.Exception.StackTrace + "\n" + e.Exception.Source;
             if (e.Exception.InnerException != null)
+            {
                 ExceptionDesc += "\n\n" + e.Exception.InnerException.Message + "\nHRESULT: 0x" + e.Exception.InnerException.HResult.ToString("X4", new CultureInfo("en-US")) + "\n" + e.Exception.InnerException.StackTrace + "\n" + e.Exception.InnerException.Source;
-            else 
+            }
+            else
+            {
                 ExceptionDesc += "\n\nNo inner exception was thrown";
+            }
 
-            await new UnhandledExceptionContentDialog(ExceptionDesc).ShowAsync();
+            _ = await new UnhandledExceptionContentDialog(ExceptionDesc).ShowAsync();
         }
 
         protected override void OnLaunched(LaunchActivatedEventArgs e)
         {
-            Shell rootShell = Window.Current.Content as Shell;
-
-            if (rootShell == null)
+            if (Window.Current.Content is not Shell rootShell)
             {
                 rootShell = new Shell();
 
@@ -42,7 +44,9 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
                 }
 
                 if (e != null)
+                {
                     rootShell.HandleArguments(e);
+                }
 
                 Window.Current.Content = rootShell;
             }
@@ -56,10 +60,9 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
 
         protected override void OnActivated(IActivatedEventArgs e)
         {
-            if (e != null && e.Kind == ActivationKind.Protocol || e != null && e.Kind == ActivationKind.ToastNotification)
+            if ((e != null && e.Kind == ActivationKind.Protocol) || (e != null && e.Kind == ActivationKind.ToastNotification))
             {
-                Shell rootShell = Window.Current.Content as Shell;
-                if (rootShell == null)
+                if (Window.Current.Content is not Shell rootShell)
                 {
                     rootShell = new Shell();
 
@@ -79,7 +82,7 @@ protected override void OnActivated(IActivatedEventArgs e)
 
         private void OnSuspending(object sender, SuspendingEventArgs e)
         {
-            var deferral = e.SuspendingOperation.GetDeferral();
+            SuspendingDeferral deferral = e.SuspendingOperation.GetDeferral();
             //TODO: Save application state and stop any background activity
             deferral.Complete();
         }

diff --git a/Chat.BackgroundTasks/BackgroundTaskUtils.cs b/Chat.BackgroundTasks/BackgroundTaskUtils.cs
@@ -1,9 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Windows.ApplicationModel.Background;
-using Windows.ApplicationModel.Chat;
 using Windows.Devices.Sms;
-using System;
 
 namespace Chat.BackgroundTasks
 {
@@ -107,7 +106,7 @@ internal static void UnRegisterBackgroundTask<T>()
 
             if (BackgroundTaskRegistration.AllTasks.Any(i => i.Value.Name.Equals(taskName)))
             {
-                var task = BackgroundTaskRegistration.AllTasks.First(i => i.Value.Name.Equals(taskName));
+                KeyValuePair<Guid, IBackgroundTaskRegistration> task = BackgroundTaskRegistration.AllTasks.First(i => i.Value.Name.Equals(taskName));
                 task.Value.Unregister(true);
             }
         }
@@ -117,16 +116,18 @@ internal static void RegisterBackgroundTask<T>(IBackgroundTrigger trigger)
             string taskName = typeof(T).Name;
 
             if (BackgroundTaskRegistration.AllTasks.Any(i => i.Value.Name.Equals(taskName)))
+            {
                 return;
+            }
 
-            var builder = new BackgroundTaskBuilder()
+            BackgroundTaskBuilder builder = new BackgroundTaskBuilder()
             {
                 Name = taskName,
                 TaskEntryPoint = typeof(T).FullName
             };
 
             builder.SetTrigger(trigger);
-            builder.Register();
+            _ = builder.Register();
         }
     }
 }
diff --git a/Chat.BackgroundTasks/Chat.BackgroundTasks.csproj b/Chat.BackgroundTasks/Chat.BackgroundTasks.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Chat.BackgroundTasks</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -130,10 +130,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.13</Version>
+      <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
-      <Version>7.1.0</Version>
+      <Version>7.1.3</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Chat.BackgroundTasks/ChatMessageNotificationBackgroundTask.cs b/Chat.BackgroundTasks/ChatMessageNotificationBackgroundTask.cs
@@ -1,9 +1,7 @@
 using Chat.Common;
 using Microsoft.Toolkit.Uwp.Notifications;
 using System;
-using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Background;
 using Windows.ApplicationModel.Chat;
@@ -43,37 +41,37 @@ private async Task<string> SaveFile(IRandomAccessStreamReference stream, string
 
             StorageFile file = await storageFolder.CreateFileAsync(filename, CreationCollisionOption.ReplaceExisting);
 
-            using (var srcStream = await stream.OpenReadAsync())
-            using (var targetStream = await file.OpenAsync(FileAccessMode.ReadWrite))
-            using (var reader = new DataReader(srcStream.GetInputStreamAt(0)))
+            using (IRandomAccessStreamWithContentType srcStream = await stream.OpenReadAsync())
+            using (IRandomAccessStream targetStream = await file.OpenAsync(FileAccessMode.ReadWrite))
+            using (DataReader reader = new DataReader(srcStream.GetInputStreamAt(0)))
             {
-                var output = targetStream.GetOutputStreamAt(0);
-                await reader.LoadAsync((uint)srcStream.Size);
+                IOutputStream output = targetStream.GetOutputStreamAt(0);
+                _ = await reader.LoadAsync((uint)srcStream.Size);
                 while (reader.UnconsumedBufferLength > 0)
                 {
                     uint dataToRead = reader.UnconsumedBufferLength > 64
                                         ? 64
                                         : reader.UnconsumedBufferLength;
 
                     IBuffer buffer = reader.ReadBuffer(dataToRead);
-                    await output.WriteAsync(buffer);
+                    _ = await output.WriteAsync(buffer);
                 }
 
-                await output.FlushAsync();
+                _ = await output.FlushAsync();
 
                 return file.Path;
             }
         }
 
         private async Task DisplayToast(ChatMessage message)
         {
-            var information = await ContactUtils.FindContactInformationFromSender(message.From);
+            ContactUtils.ContactInformation information = await ContactUtils.FindContactInformationFromSender(message.From);
             string thumbnailpath = "";
             string text = "";
 
             string deviceid = SmsDevice2.GetDefault().DeviceId;
 
-            foreach (var attachment in message.Attachments)
+            foreach (ChatMessageAttachment attachment in message.Attachments)
             {
                 try
                 {
@@ -92,14 +90,14 @@ private async Task DisplayToast(ChatMessage message)
                     if (attachment.MimeType.StartsWith("image/"))
                     {
                         text += "Image content in this message. ";
-                        var imageextension = attachment.MimeType.Split('/').Last();
+                        string imageextension = attachment.MimeType.Split('/').Last();
                         thumbnailpath = await SaveFile(attachment.DataStreamReference, "messagepicture." + DateTimeOffset.Now.ToUnixTimeMilliseconds() + "." + imageextension);
                     }
 
                     if (attachment.MimeType.StartsWith("audio/"))
                     {
                         text += "Audio content in this message. ";
-                        var audioextension = attachment.MimeType.Split('/').Last();
+                        string audioextension = attachment.MimeType.Split('/').Last();
                     }
                 }
                 catch
@@ -108,7 +106,7 @@ private async Task DisplayToast(ChatMessage message)
                 }
             }
 
-            var toastContent = new ToastContent()
+            ToastContent toastContent = new ToastContent()
             {
                 Visual = new ToastVisual()
                 {
@@ -167,7 +165,7 @@ private async Task DisplayToast(ChatMessage message)
                 }
             };
 
-            var toastNotif = new ToastNotification(toastContent.GetXml());
+            ToastNotification toastNotif = new ToastNotification(toastContent.GetXml());
             ToastNotificationManager.CreateToastNotifier().Show(toastNotif);
         }
     }

diff --git a/Chat.BackgroundTasks/SmsBackgroundTask.cs b/Chat.BackgroundTasks/SmsBackgroundTask.cs
@@ -1,13 +1,9 @@
 using Chat.Common;
 using Microsoft.Toolkit.Uwp.Notifications;
 using System;
-using System.IO;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Background;
 using Windows.Devices.Sms;
-using Windows.Storage;
-using Windows.Storage.Streams;
 using Windows.UI.Notifications;
 
 namespace Chat.BackgroundTasks
@@ -72,7 +68,7 @@ private async Task DisplayToast(IBackgroundTaskInstance taskInstance)
                         return;
                 }
 
-                var toastContent = new ToastContent()
+                ToastContent toastContent = new ToastContent()
                 {
                     Visual = new ToastVisual()
                     {
@@ -127,7 +123,7 @@ private async Task DisplayToast(IBackgroundTaskInstance taskInstance)
                     }
                 };
 
-                var toastNotif = new ToastNotification(toastContent.GetXml());
+                ToastNotification toastNotif = new ToastNotification(toastContent.GetXml());
                 ToastNotificationManager.CreateToastNotifier().Show(toastNotif);
 
                 try

diff --git a/Chat.BackgroundTasks/SmsReplyBackgroundTask.cs b/Chat.BackgroundTasks/SmsReplyBackgroundTask.cs
@@ -29,7 +29,7 @@ private async Task HandleTaskActions(IBackgroundTaskInstance taskInstance)
 
                     }
 
-                    var details = taskInstance.TriggerDetails as ToastNotificationActionTriggerDetail;
+                    ToastNotificationActionTriggerDetail details = taskInstance.TriggerDetails as ToastNotificationActionTriggerDetail;
 
                     string arguments = details.Argument;
 
@@ -45,7 +45,7 @@ private async Task HandleTaskActions(IBackgroundTaskInstance taskInstance)
                                 {
                                     string messagetosend = (string)details.UserInput["textBox"];
                                     SmsDevice2 smsDevice = SmsDevice2.FromId(deviceid);
-                                    await SmsUtils.SendTextMessageAsync(smsDevice, from, messagetosend);
+                                    _ = await SmsUtils.SendTextMessageAsync(smsDevice, from, messagetosend);
                                 }
                                 catch
                                 {

diff --git a/Chat.BackgroundTasks/UpdateTask.cs b/Chat.BackgroundTasks/UpdateTask.cs
@@ -18,7 +18,7 @@ public void Run(IBackgroundTaskInstance taskInstance)
             BackgroundTaskUtils.UnRegisterToastNotificationBackgroundTasks();
             BackgroundTaskUtils.RegisterToastNotificationBackgroundTasks();
 
-            var toastContent = new ToastContent()
+            ToastContent toastContent = new ToastContent()
             {
                 Visual = new ToastVisual()
                 {
@@ -40,7 +40,7 @@ public void Run(IBackgroundTaskInstance taskInstance)
             };
 
             // Create the toast notification
-            var toastNotif = new ToastNotification(toastContent.GetXml());
+            ToastNotification toastNotif = new ToastNotification(toastContent.GetXml());
 
             // And send the notification
             ToastNotificationManager.CreateToastNotifier().Show(toastNotif);

diff --git a/Chat.Common/BadgeHandler.cs b/Chat.Common/BadgeHandler.cs
@@ -1,8 +1,4 @@
-using Windows.Data.Xml.Dom;
-using Windows.Storage;
-using Windows.UI.Notifications;
-
-namespace Chat.Common
+namespace Chat.Common
 {
     public class BadgeHandler
     {

diff --git a/Chat.Common/Chat.Common.csproj b/Chat.Common/Chat.Common.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>Chat.Common</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -128,7 +128,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.13</Version>
+      <Version>6.2.14</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">