UWP .NET9 (#555)

* Ground work for NET9 UWP switch.

* Add launch settings for Wino.Mail

* Added new test WAP project

* fix platforms in slnx solution

* ManagePackageVersionsCentrally set default

* Fixing assets and couple issues with the new packaging project.

* Add back markdown

* Fix nuget warnings

* FIx error in WAP about build tools

* Add build.props with default language preview

* Some AOT compilation progress.

* More AOT stuff.

* Remove deprecated protocol auth activation handler.

* Fix remaining protocol handler for google auth.

* Even more AOT

* More more AOT fixes

* Fix a few more AOT warnings

* Fix signature editor AOT

* Fix composer and renderer AOT JSON

* Outlook Sync AOT

* Fixing bundle generation and package signing.

---------

Co-authored-by: Burak Kaan Köse <bkaankose@outlook.com>

Wino.Core/Services/AutoDiscoveryService.cs

@@ -4,6 +4,7 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using Serilog;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models;
 using Wino.Core.Domain.Models.AutoDiscovery;
 
 namespace Wino.Core.Services
@@ -22,7 +23,7 @@ namespace Wino.Core.Services
         public Task<AutoDiscoverySettings> GetAutoDiscoverySettings(AutoDiscoveryMinimalSettings autoDiscoveryMinimalSettings)
             => GetSettingsFromFiretrustAsync(autoDiscoveryMinimalSettings.Email);
 
-        private async Task<AutoDiscoverySettings> GetSettingsFromFiretrustAsync(string mailAddress)
+        private static async Task<AutoDiscoverySettings> GetSettingsFromFiretrustAsync(string mailAddress)
         {
             using var client = new HttpClient();
             var response = await client.GetAsync($"{FiretrustURL}{mailAddress}");
@@ -37,13 +38,13 @@ namespace Wino.Core.Services
             }
         }
 
-        private async Task<AutoDiscoverySettings> DeserializeFiretrustResponse(HttpResponseMessage response)
+        private static async Task<AutoDiscoverySettings> DeserializeFiretrustResponse(HttpResponseMessage response)
         {
             try
             {
                 var content = await response.Content.ReadAsStringAsync();
 
-                return JsonSerializer.Deserialize<AutoDiscoverySettings>(content);
+                return JsonSerializer.Deserialize(content, DomainModelsJsonContext.Default.AutoDiscoverySettings);
             }
             catch (Exception ex)
             {

Wino.Core/Synchronizers/OutlookSynchronizer.cs

@@ -7,6 +7,7 @@ using System.Net;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -39,6 +40,10 @@ using Wino.Core.Requests.Mail;
 
 namespace Wino.Core.Synchronizers.Mail
 {
+    [JsonSerializable(typeof(Microsoft.Graph.Me.Messages.Item.Move.MovePostRequestBody))]
+    [JsonSerializable(typeof(OutlookFileAttachment))]
+    public partial class OutlookSynchronizerJsonContext: JsonSerializerContext;
+
     public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message, Event>
     {
         public override uint BatchModificationSize => 20;
@@ -98,9 +103,6 @@ namespace Wino.Core.Synchronizers.Mail
             _graphClient = new GraphServiceClient(httpClient, new BaseBearerTokenAuthenticationProvider(tokenProvider));
 
             _outlookChangeProcessor = outlookChangeProcessor;
-
-            // Specify to use TLS 1.2 as default connection
-            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
         }
 
         #region MS Graph Handlers
@@ -558,11 +560,11 @@ namespace Wino.Core.Synchronizers.Mail
         /// <param name="requestInformation">Post request information.</param>
         /// <param name="content">Content object to serialize.</param>
         /// <returns>Updated post request information.</returns>
-        private RequestInformation PreparePostRequestInformation(RequestInformation requestInformation, object content = null)
+        private RequestInformation PreparePostRequestInformation(RequestInformation requestInformation, Microsoft.Graph.Me.Messages.Item.Move.MovePostRequestBody content = null)
         {
             requestInformation.Headers.Clear();
 
-            string contentJson = content == null ? "{}" : JsonSerializer.Serialize(content);
+            string contentJson = content == null ? "{}" : JsonSerializer.Serialize(content, OutlookSynchronizerJsonContext.Default.MovePostRequestBody);
 
             requestInformation.Content = new MemoryStream(Encoding.UTF8.GetBytes(contentJson));
             requestInformation.HttpMethod = Method.POST;
@@ -584,7 +586,7 @@ namespace Wino.Core.Synchronizers.Mail
                     DestinationId = item.ToFolder.RemoteFolderId
                 };
 
-                return PreparePostRequestInformation(_graphClient.Me.Messages[item.Item.Id.ToString()].Move.ToPostRequestInformation(requestBody),
+                return PreparePostRequestInformation(_graphClient.Me.Messages[item.Item.Id].Move.ToPostRequestInformation(requestBody),
                                                                      requestBody);
             });
         }
@@ -598,7 +600,7 @@ namespace Wino.Core.Synchronizers.Mail
                     Flag = new FollowupFlag() { FlagStatus = item.IsFlagged ? FollowupFlagStatus.Flagged : FollowupFlagStatus.NotFlagged }
                 };
 
-                return _graphClient.Me.Messages[item.Item.Id.ToString()].ToPatchRequestInformation(message);
+                return _graphClient.Me.Messages[item.Item.Id].ToPatchRequestInformation(message);
             });
         }
 
@@ -759,11 +761,11 @@ namespace Wino.Core.Synchronizers.Mail
                 allAttachments.Add(attachment);
             }
 
-            RequestInformation PrepareUploadAttachmentRequest(RequestInformation requestInformation, OutlookFileAttachment outlookFileAttachment)
+            static RequestInformation PrepareUploadAttachmentRequest(RequestInformation requestInformation, OutlookFileAttachment outlookFileAttachment)
             {
                 requestInformation.Headers.Clear();
 
-                string contentJson = JsonSerializer.Serialize(outlookFileAttachment);
+                string contentJson = JsonSerializer.Serialize(outlookFileAttachment, OutlookSynchronizerJsonContext.Default.OutlookFileAttachment);
 
                 requestInformation.Content = new MemoryStream(Encoding.UTF8.GetBytes(contentJson));
                 requestInformation.HttpMethod = Method.POST;
@@ -1056,7 +1058,7 @@ namespace Wino.Core.Synchronizers.Mail
                         await _handleItemRetrievalSemaphore.WaitAsync();
                         await _outlookChangeProcessor.ManageCalendarEventAsync(item, calendar, Account).ConfigureAwait(false);
                     }
-                    catch (Exception ex)
+                    catch (Exception)
                     {
                         // _logger.Error(ex, "Error occurred while handling item {Id} for calendar {Name}", item.Id, calendar.Name);
                     }

Wino.Core/Wino.Core.csproj

@@ -1,55 +1,43 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>Wino.Core</RootNamespace>
-    <Configurations>Debug;Release</Configurations>
-	<LangVersion>12</LangVersion>
-	<Platforms>AnyCPU;x64;x86</Platforms>
-	  <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
-	  <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="WinoSynchronizerFactory.cs" />
-  </ItemGroup>
-
-
-   <ItemGroup>
-     <PackageReference Include="CommunityToolkit.Diagnostics" Version="8.3.2" />
-     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-     <PackageReference Include="Google.Apis.Calendar.v3" Version="1.68.0.3592" />
-     <PackageReference Include="Google.Apis.Gmail.v1" Version="1.68.0.3427" />
-     <PackageReference Include="Google.Apis.PeopleService.v1" Version="1.68.0.3359" />
-     <PackageReference Include="HtmlAgilityPack" Version="1.11.70" />
-     <PackageReference Include="HtmlKit" Version="1.1.0" />
-     <PackageReference Include="IsExternalInit" Version="1.0.3">
-       <PrivateAssets>all</PrivateAssets>
-       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-     </PackageReference>
-     <PackageReference Include="MailKit" Version="4.9.0" />
-     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-     <PackageReference Include="Microsoft.Graph" Version="5.67.0" />
-     <PackageReference Include="Microsoft.Identity.Client" Version="4.66.2" />
-     <PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.66.2" />
-     <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.66.2" />
-     <PackageReference Include="MimeKit" Version="4.9.0" />
-     <PackageReference Include="morelinq" Version="4.3.0" />
-     <PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
-     <PackageReference Include="NodaTime" Version="3.2.0" />
-     <PackageReference Include="Serilog" Version="4.1.0" />
-     <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
-     <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
-     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-     <PackageReference Include="SkiaSharp" Version="2.88.9" />
-     <PackageReference Include="SqlKata" Version="2.4.0" />
-     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
-   </ItemGroup>
-
-   <ItemGroup>
-     <ProjectReference Include="..\Wino.Authentication\Wino.Authentication.csproj" />
-     <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />
-     <ProjectReference Include="..\Wino.Messages\Wino.Messaging.csproj" />
-     <ProjectReference Include="..\Wino.Services\Wino.Services.csproj" />
-   </ItemGroup>
-</Project>
+	<PropertyGroup>
+		<TargetFramework>net9.0</TargetFramework>
+		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+		<RootNamespace>Wino.Core</RootNamespace>
+		<Configurations>Debug;Release</Configurations>
+		<Platforms>x86;x64;arm64</Platforms>
+		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
+		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.Diagnostics"  />
+		<PackageReference Include="CommunityToolkit.Mvvm"  />
+		<PackageReference Include="Google.Apis.Calendar.v3"  />
+		<PackageReference Include="Google.Apis.Gmail.v1"  />
+		<PackageReference Include="Google.Apis.PeopleService.v1" />
+		<PackageReference Include="HtmlAgilityPack"  />
+		<PackageReference Include="HtmlKit"  />
+		<PackageReference Include="MailKit"  />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection"  />
+		<PackageReference Include="Microsoft.Graph" />
+		<PackageReference Include="Microsoft.Identity.Client"  />
+		<PackageReference Include="Microsoft.Identity.Client.Broker" />
+		<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal"  />
+		<PackageReference Include="MimeKit"  />
+		<PackageReference Include="morelinq"  />
+		<PackageReference Include="Nito.AsyncEx.Tasks" />
+		<PackageReference Include="NodaTime"  />
+		<PackageReference Include="Serilog"  />
+		<PackageReference Include="Serilog.Exceptions"  />
+		<PackageReference Include="Serilog.Sinks.Debug"  />
+		<PackageReference Include="Serilog.Sinks.File"  />
+		<PackageReference Include="SkiaSharp" />
+		<PackageReference Include="SqlKata"  />
+		<PackageReference Include="System.Text.Encoding.CodePages"  />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\Wino.Authentication\Wino.Authentication.csproj" />
+		<ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />
+		<ProjectReference Include="..\Wino.Messages\Wino.Messaging.csproj" />
+		<ProjectReference Include="..\Wino.Services\Wino.Services.csproj" />
+	</ItemGroup>
+</Project>

Wino.Core/WinoSynchronizerFactory.cs

@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Wino.Core.Authenticators;
-using Wino.Core.Domain.Entities;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Integration.Processors;
-using Wino.Core.Services;
-using Wino.Core.Synchronizers;
-
-namespace Wino.Core
-{
-    /// <summary>
-    /// Factory that keeps track of all integrator with associated mail accounts.
-    /// Synchronizer per-account makes sense because re-generating synchronizers are not ideal.
-    /// Users might interact with multiple accounts in 1 app session.
-    /// </summary>
-    public class WinoSynchronizerFactory : IWinoSynchronizerFactory
-    {
-        private readonly List<IBaseSynchronizer> synchronizerCache = new List<IBaseSynchronizer>();
-
-        private bool isInitialized = false;
-        private readonly INativeAppService _nativeAppService;
-        private readonly ITokenService _tokenService;
-        private readonly IFolderService _folderService;
-        private readonly IAccountService _accountService;
-        private readonly IContactService _contactService;
-
-        private readonly INotificationBuilder _notificationBuilder;
-        private readonly ISignatureService _signatureService;
-        private readonly IDatabaseService _databaseService;
-        private readonly IMimeFileService _mimeFileService;
-        private readonly IOutlookChangeProcessor _outlookChangeProcessor;
-        private readonly IGmailChangeProcessor _gmailChangeProcessor;
-        private readonly IImapChangeProcessor _imapChangeProcessor;
-
-        public WinoSynchronizerFactory(INativeAppService nativeAppService,
-                                     ITokenService tokenService,
-                                     IFolderService folderService,
-                                     IAccountService accountService,
-                                     IContactService contactService,
-                                     INotificationBuilder notificationBuilder,
-                                     ISignatureService signatureService,
-                                     IDatabaseService databaseService,
-                                     IMimeFileService mimeFileService,
-                                     IOutlookChangeProcessor outlookChangeProcessor,
-                                     IGmailChangeProcessor gmailChangeProcessor,
-                                     IImapChangeProcessor imapChangeProcessor)
-        {
-            _contactService = contactService;
-            _notificationBuilder = notificationBuilder;
-            _nativeAppService = nativeAppService;
-            _tokenService = tokenService;
-            _folderService = folderService;
-            _accountService = accountService;
-            _signatureService = signatureService;
-            _databaseService = databaseService;
-            _mimeFileService = mimeFileService;
-            _outlookChangeProcessor = outlookChangeProcessor;
-            _gmailChangeProcessor = gmailChangeProcessor;
-            _imapChangeProcessor = imapChangeProcessor;
-        }
-
-        public IBaseSynchronizer GetAccountSynchronizer(Guid accountId)
-            => synchronizerCache.Find(a => a.Account.Id == accountId);
-
-        private IBaseSynchronizer CreateIntegratorWithDefaultProcessor(MailAccount mailAccount)
-        {
-            var providerType = mailAccount.ProviderType;
-
-            switch (providerType)
-            {
-                case Domain.Enums.MailProviderType.Outlook:
-                    var outlookAuthenticator = new OutlookAuthenticator(_tokenService, _nativeAppService);
-                    return new OutlookSynchronizer(mailAccount, outlookAuthenticator, _outlookChangeProcessor);
-                case Domain.Enums.MailProviderType.Gmail:
-                    var gmailAuthenticator = new GmailAuthenticator(_tokenService, _nativeAppService);
-                    return new GmailSynchronizer(mailAccount, gmailAuthenticator, _gmailChangeProcessor);
-                case Domain.Enums.MailProviderType.Office365:
-                    break;
-                case Domain.Enums.MailProviderType.Yahoo:
-                    break;
-                case Domain.Enums.MailProviderType.IMAP4:
-                    return new ImapSynchronizer(mailAccount, _imapChangeProcessor);
-                default:
-                    break;
-            }
-
-            return null;
-        }
-
-        public void DeleteSynchronizer(MailAccount account)
-        {
-            var synchronizer = GetAccountSynchronizer(account.Id);
-
-            if (synchronizer == null) return;
-
-            synchronizerCache.Remove(synchronizer);
-        }
-
-        public async Task InitializeAsync()
-        {
-            if (isInitialized) return;
-
-            var accounts = await _accountService.GetAccountsAsync();
-
-            foreach (var account in accounts)
-            {
-                CreateNewSynchronizer(account);
-            }
-
-            isInitialized = true;
-        }
-
-        public IBaseSynchronizer CreateNewSynchronizer(MailAccount account)
-        {
-            var synchronizer = CreateIntegratorWithDefaultProcessor(account);
-
-            synchronizerCache.Add(synchronizer);
-
-            return synchronizer;
-        }
-    }
-}