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
bkaankose · Dec 27, 2024 · 8e129c5 · 8e129c5
1 parent fbc3ca4
commit 8e129c5
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git 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
@@ -6,6 +6,8 @@
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <!-- UWP WAM Authentication on Xbox needs this. -->
     <UseDotNetNativeSharedAssemblyFrameworkPackage>false</UseDotNetNativeSharedAssemblyFrameworkPackage>
+    <PackageCertificateThumbprint>125A5273FCFE8D551C3FED87F67C87A663E98F1B</PackageCertificateThumbprint>
+    <PackageCertificateKeyFile>Wino.Mail_TemporaryKey.pfx</PackageCertificateKeyFile>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
@@ -32,8 +34,6 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-    <PackageCertificateThumbprint>125A5273FCFE8D551C3FED87F67C87A663E98F1B</PackageCertificateThumbprint>
-    <PackageCertificateKeyFile />
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">

diff --git a/Wino.Mail.ViewModels/AccountManagementViewModel.cs b/Wino.Mail.ViewModels/AccountManagementViewModel.cs
@@ -165,7 +165,7 @@ private async Task AddNewAccountAsync()
                             Type = MailSynchronizationType.UpdateProfile
                         };
 
-                        var profileSynchronizationResponse = await WinoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewSynchronizationRequested>(new NewSynchronizationRequested(profileSyncOptions, SynchronizationSource.Client));
+                        var profileSynchronizationResponse = await WinoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewMailSynchronizationRequested>(new NewMailSynchronizationRequested(profileSyncOptions, SynchronizationSource.Client));
 
                         var profileSynchronizationResult = profileSynchronizationResponse.Data;
 
@@ -195,7 +195,7 @@ private async Task AddNewAccountAsync()
                         Type = MailSynchronizationType.FoldersOnly
                     };
 
-                    var folderSynchronizationResponse = await WinoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewSynchronizationRequested>(new NewSynchronizationRequested(folderSyncOptions, SynchronizationSource.Client));
+                    var folderSynchronizationResponse = await WinoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewMailSynchronizationRequested>(new NewMailSynchronizationRequested(folderSyncOptions, SynchronizationSource.Client));
 
                     var folderSynchronizationResult = folderSynchronizationResponse.Data;
 
@@ -213,7 +213,7 @@ private async Task AddNewAccountAsync()
                             Type = MailSynchronizationType.Alias
                         };
 
-                        var aliasSyncResponse = await WinoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewSynchronizationRequested>(new NewSynchronizationRequested(aliasSyncOptions, SynchronizationSource.Client));
+                        var aliasSyncResponse = await WinoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewMailSynchronizationRequested>(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
@@ -82,7 +82,7 @@ private async Task SyncAliasesAsync()
                 Type = MailSynchronizationType.Alias
             };
 
-            var aliasSyncResponse = await _winoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewSynchronizationRequested>(new NewSynchronizationRequested(aliasSyncOptions, SynchronizationSource.Client));
+            var aliasSyncResponse = await _winoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewMailSynchronizationRequested>(new NewMailSynchronizationRequested(aliasSyncOptions, SynchronizationSource.Client));
 
             if (aliasSyncResponse.IsSuccess)
                 await LoadAliasesAsync();

diff --git a/Wino.Mail.ViewModels/AppShellViewModel.cs b/Wino.Mail.ViewModels/AppShellViewModel.cs
@@ -318,7 +318,7 @@ private async Task ForceAllAccountSynchronizationsAsync()
                     Type = MailSynchronizationType.FullFolders
                 };
 
-                Messenger.Send(new NewSynchronizationRequested(options, SynchronizationSource.Client));
+                Messenger.Send(new NewMailSynchronizationRequested(options, SynchronizationSource.Client));
             }
         }
 
@@ -891,7 +891,7 @@ protected override async void OnAccountCreated(MailAccount createdAccount)
                 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
@@ -40,7 +40,7 @@ public partial class MailListPageViewModel : MailBaseViewModel,
         IRecipient<MailItemSelectedEvent>,
         IRecipient<MailItemSelectionRemovedEvent>,
         IRecipient<AccountSynchronizationCompleted>,
-        IRecipient<NewSynchronizationRequested>,
+        IRecipient<NewMailSynchronizationRequested>,
         IRecipient<AccountSynchronizerStateChanged>
     {
         private bool isChangingFolder = false;
@@ -479,7 +479,7 @@ private void SyncFolder()
                     GroupedSynchronizationTrackingId = trackingSynchronizationId
                 };
 
-                Messenger.Send(new NewSynchronizationRequested(options, SynchronizationSource.Client));
+                Messenger.Send(new NewMailSynchronizationRequested(options, SynchronizationSource.Client));
             }
         }
 
@@ -989,7 +989,7 @@ void IRecipient<MailItemNavigationRequested>.Receive(MailItemNavigationRequested
 
         #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
@@ -97,7 +97,7 @@ public async Task HandleSystemFolderConfigurationDialogAsync(Guid accountId, IFo
                         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
@@ -7,6 +7,7 @@
     <!-- UWP WAM Authentication on Xbox needs this. -->
     <UseDotNetNativeSharedAssemblyFrameworkPackage>false</UseDotNetNativeSharedAssemblyFrameworkPackage>
     <PackageCertificateThumbprint>3B34414D49FBF00A35A040085092D8699459EA8E</PackageCertificateThumbprint>
+    <PackageCertificateKeyFile>Wino.Mail_TemporaryKey.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -24,7 +25,6 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
-    <PackageCertificateKeyFile>Wino.Mail_TemporaryKey.pfx</PackageCertificateKeyFile>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>