From 8e129c561d72952a63898f6ff52e9e9ce6e4e850 Mon Sep 17 00:00:00 2001 From: Benjin Dubishar Date: Fri, 27 Dec 2024 11:27:45 -0800 Subject: [PATCH] Some miscellaneous cleanup (#494) * Updating CONTRIBUTING guidelines * Adding PackageCertificateKeyFile ref to Calendar proj to allow building on fresh machines * Adding missing conversions to MailSync type --- CONTRIBUTING.md | 7 ++++++- Wino.Calendar/Wino.Calendar.csproj | 4 ++-- Wino.Mail.ViewModels/AccountManagementViewModel.cs | 6 +++--- Wino.Mail.ViewModels/AliasManagementPageViewModel.cs | 2 +- Wino.Mail.ViewModels/AppShellViewModel.cs | 4 ++-- Wino.Mail.ViewModels/MailListPageViewModel.cs | 6 +++--- Wino.Mail/Services/DialogService.cs | 2 +- Wino.Mail/Wino.Mail.csproj | 2 +- 8 files changed, 19 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2909f7e5..09e4240a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,7 +15,12 @@ Wino Mail is [Universal Windows Platform](https://learn.microsoft.com/en-us/wind **Min Version:** Windows 10 1809 **Target Version:** Windows 11 22H2 -It's pretty straightforward after cloning the repo. There are no prerequisites needed. Just open **Wino.sln** solution in your IDE and launch. +## Prerequisites + +* ".NET desktop development" workload in Visual Studio 2022+ +* .NET SDK 8.0+ + +With those installed, it's pretty straightforward after cloning the repo. Just open **Wino.sln** solution in your IDE and launch. ## Project Architecture diff --git a/Wino.Calendar/Wino.Calendar.csproj b/Wino.Calendar/Wino.Calendar.csproj index e3d9ba40..d4419a84 100644 --- a/Wino.Calendar/Wino.Calendar.csproj +++ b/Wino.Calendar/Wino.Calendar.csproj @@ -6,6 +6,8 @@ PackageReference false + 125A5273FCFE8D551C3FED87F67C87A663E98F1B + Wino.Mail_TemporaryKey.pfx False SHA256 True @@ -32,8 +34,6 @@ {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true True - 125A5273FCFE8D551C3FED87F67C87A663E98F1B - True diff --git a/Wino.Mail.ViewModels/AccountManagementViewModel.cs b/Wino.Mail.ViewModels/AccountManagementViewModel.cs index cdd81e10..e5769bd2 100644 --- a/Wino.Mail.ViewModels/AccountManagementViewModel.cs +++ b/Wino.Mail.ViewModels/AccountManagementViewModel.cs @@ -165,7 +165,7 @@ namespace Wino.Mail.ViewModels Type = MailSynchronizationType.UpdateProfile }; - var profileSynchronizationResponse = await WinoServerConnectionManager.GetResponseAsync(new NewSynchronizationRequested(profileSyncOptions, SynchronizationSource.Client)); + var profileSynchronizationResponse = await WinoServerConnectionManager.GetResponseAsync(new NewMailSynchronizationRequested(profileSyncOptions, SynchronizationSource.Client)); var profileSynchronizationResult = profileSynchronizationResponse.Data; @@ -195,7 +195,7 @@ namespace Wino.Mail.ViewModels Type = MailSynchronizationType.FoldersOnly }; - var folderSynchronizationResponse = await WinoServerConnectionManager.GetResponseAsync(new NewSynchronizationRequested(folderSyncOptions, SynchronizationSource.Client)); + var folderSynchronizationResponse = await WinoServerConnectionManager.GetResponseAsync(new NewMailSynchronizationRequested(folderSyncOptions, SynchronizationSource.Client)); var folderSynchronizationResult = folderSynchronizationResponse.Data; @@ -213,7 +213,7 @@ namespace Wino.Mail.ViewModels Type = MailSynchronizationType.Alias }; - var aliasSyncResponse = await WinoServerConnectionManager.GetResponseAsync(new NewSynchronizationRequested(aliasSyncOptions, SynchronizationSource.Client)); + var aliasSyncResponse = await WinoServerConnectionManager.GetResponseAsync(new NewMailSynchronizationRequested(aliasSyncOptions, SynchronizationSource.Client)); var aliasSynchronizationResult = folderSynchronizationResponse.Data; if (aliasSynchronizationResult.CompletedState != SynchronizationCompletedState.Success) diff --git a/Wino.Mail.ViewModels/AliasManagementPageViewModel.cs b/Wino.Mail.ViewModels/AliasManagementPageViewModel.cs index 978736a4..77656fee 100644 --- a/Wino.Mail.ViewModels/AliasManagementPageViewModel.cs +++ b/Wino.Mail.ViewModels/AliasManagementPageViewModel.cs @@ -82,7 +82,7 @@ namespace Wino.Mail.ViewModels Type = MailSynchronizationType.Alias }; - var aliasSyncResponse = await _winoServerConnectionManager.GetResponseAsync(new NewSynchronizationRequested(aliasSyncOptions, SynchronizationSource.Client)); + var aliasSyncResponse = await _winoServerConnectionManager.GetResponseAsync(new NewMailSynchronizationRequested(aliasSyncOptions, SynchronizationSource.Client)); if (aliasSyncResponse.IsSuccess) await LoadAliasesAsync(); diff --git a/Wino.Mail.ViewModels/AppShellViewModel.cs b/Wino.Mail.ViewModels/AppShellViewModel.cs index 40a8744f..3c5362d0 100644 --- a/Wino.Mail.ViewModels/AppShellViewModel.cs +++ b/Wino.Mail.ViewModels/AppShellViewModel.cs @@ -318,7 +318,7 @@ namespace Wino.Mail.ViewModels Type = MailSynchronizationType.FullFolders }; - Messenger.Send(new NewSynchronizationRequested(options, SynchronizationSource.Client)); + Messenger.Send(new NewMailSynchronizationRequested(options, SynchronizationSource.Client)); } } @@ -891,7 +891,7 @@ namespace Wino.Mail.ViewModels Type = MailSynchronizationType.FullFolders, }; - Messenger.Send(new NewSynchronizationRequested(options, SynchronizationSource.Client)); + Messenger.Send(new NewMailSynchronizationRequested(options, SynchronizationSource.Client)); try { diff --git a/Wino.Mail.ViewModels/MailListPageViewModel.cs b/Wino.Mail.ViewModels/MailListPageViewModel.cs index 58e820c0..10e3dac7 100644 --- a/Wino.Mail.ViewModels/MailListPageViewModel.cs +++ b/Wino.Mail.ViewModels/MailListPageViewModel.cs @@ -40,7 +40,7 @@ namespace Wino.Mail.ViewModels IRecipient, IRecipient, IRecipient, - IRecipient, + IRecipient, IRecipient { private bool isChangingFolder = false; @@ -479,7 +479,7 @@ namespace Wino.Mail.ViewModels GroupedSynchronizationTrackingId = trackingSynchronizationId }; - Messenger.Send(new NewSynchronizationRequested(options, SynchronizationSource.Client)); + Messenger.Send(new NewMailSynchronizationRequested(options, SynchronizationSource.Client)); } } @@ -989,7 +989,7 @@ namespace Wino.Mail.ViewModels #endregion - public async void Receive(NewSynchronizationRequested message) + public async void Receive(NewMailSynchronizationRequested message) => await ExecuteUIThread(() => { OnPropertyChanged(nameof(CanSynchronize)); }); protected override async void OnFolderSynchronizationEnabled(IMailItemFolder mailItemFolder) diff --git a/Wino.Mail/Services/DialogService.cs b/Wino.Mail/Services/DialogService.cs index edccc560..1a419969 100644 --- a/Wino.Mail/Services/DialogService.cs +++ b/Wino.Mail/Services/DialogService.cs @@ -97,7 +97,7 @@ namespace Wino.Services Type = MailSynchronizationType.FullFolders, }; - WeakReferenceMessenger.Default.Send(new NewSynchronizationRequested(options, SynchronizationSource.Client)); + WeakReferenceMessenger.Default.Send(new NewMailSynchronizationRequested(options, SynchronizationSource.Client)); } } catch (Exception ex) diff --git a/Wino.Mail/Wino.Mail.csproj b/Wino.Mail/Wino.Mail.csproj index 9cf6306f..c4fe73a3 100644 --- a/Wino.Mail/Wino.Mail.csproj +++ b/Wino.Mail/Wino.Mail.csproj @@ -7,6 +7,7 @@ false 3B34414D49FBF00A35A040085092D8699459EA8E + Wino.Mail_TemporaryKey.pfx Debug @@ -24,7 +25,6 @@ 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true - Wino.Mail_TemporaryKey.pfx False SHA256 False