Added Velopack upgrade support to the project.

Jaben · Jaben · commit a5ac6300ebe2 · 2024-10-11T17:03:22.000-04:00
diff --git a/build.ps1 b/build.ps1
@@ -1,3 +1,3 @@
 dotnet tool install --global Cake.Tool --version 3.2.0
-dotnet tool install --global vpk --version 0.0.359
+dotnet tool install --global vpk --version 0.0.626
 dotnet-cake --configuration=Release
diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs
@@ -5,6 +5,6 @@
 //------------------------------------------------------------------------------
 using System.Reflection;
 
-[assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.0.0")]
-[assembly: AssemblyInformationalVersion("7.0.0.0")]
+[assembly: AssemblyVersion("7.1.0.0")]
+[assembly: AssemblyFileVersion("7.1.0.0")]
+[assembly: AssemblyInformationalVersion("7.1.0-dev.111+Branch.develop.Sha.c6c2a6557ac3b3a8d1ebd93f45de2ff515018f18")]
diff --git a/src/Papercut.Common/Papercut.Common.csproj b/src/Papercut.Common/Papercut.Common.csproj
@@ -5,7 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
+    <PackageReference Include="System.Runtime.Caching" Version="8.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
+    <PackageReference Update="Serilog" Version="4.0.2" />
   </ItemGroup>
   
 </Project>
diff --git a/src/Papercut.Core/AppConstants.cs b/src/Papercut.Core/AppConstants.cs
@@ -24,6 +24,8 @@ public static class AppConstants
 
         public const string CompanyName = "Changemaker Studios";
 
+        public const string UpgradeUrl = "https://github.com/ChangemakerStudios/Papercut-SMTP";
+
         public static string AppDataDirectory { get; } =
             Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData),
                 CompanyName,
diff --git a/src/Papercut.Core/Papercut.Core.csproj b/src/Papercut.Core/Papercut.Core.csproj
@@ -10,22 +10,27 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac">
-      <Version>8.0.0</Version>
+      <Version>8.1.1</Version>
     </PackageReference>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
     <PackageReference Include="AutofacSerilogIntegration">
       <Version>5.0.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="Serilog.Sinks.Trace" Version="3.0.0" />
+    <PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.Trace" Version="4.0.0" />
     <PackageReference Include="System.Management" Version="8.0.0" />
-    <PackageReference Include="System.Reactive" Version="6.0.0" />
+    <PackageReference Include="System.Reactive" Version="6.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
+    <PackageReference Update="Serilog" Version="4.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Papercut.Infrastructure.IPComm/Papercut.Infrastructure.IPComm.csproj b/src/Papercut.Infrastructure.IPComm/Papercut.Infrastructure.IPComm.csproj
@@ -13,11 +13,16 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac">
-      <Version>8.0.0</Version>
+      <Version>8.1.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
-    <PackageReference Include="System.Reactive" Version="6.0.0" />
+    <PackageReference Include="System.Reactive" Version="6.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
+    <PackageReference Update="Serilog" Version="4.0.2" />
   </ItemGroup>
 </Project>
diff --git a/src/Papercut.Infrastructure.Smtp/Papercut.Infrastructure.Smtp.csproj b/src/Papercut.Infrastructure.Smtp/Papercut.Infrastructure.Smtp.csproj
@@ -14,4 +14,9 @@
     <ProjectReference Include="..\Papercut.Message\Papercut.Message.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
+    <PackageReference Update="Serilog" Version="4.0.2" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Papercut.Message/Papercut.Message.csproj b/src/Papercut.Message/Papercut.Message.csproj
@@ -13,15 +13,20 @@
   
   <ItemGroup>
     <PackageReference Include="Autofac">
-      <Version>8.0.0</Version>
+      <Version>8.1.1</Version>
     </PackageReference>
     <PackageReference Include="MailKit">
-      <Version>4.4.0</Version>
+      <Version>4.8.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="MimeKit">
-      <Version>4.4.0</Version>
+      <Version>4.8.0</Version>
     </PackageReference>
-    <PackageReference Include="System.Reactive" Version="6.0.0" />
+    <PackageReference Include="System.Reactive" Version="6.0.1" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
+    <PackageReference Update="Serilog" Version="4.0.2" />
   </ItemGroup>
 </Project>
diff --git a/src/Papercut.Rules/Papercut.Rules.csproj b/src/Papercut.Rules/Papercut.Rules.csproj
@@ -15,18 +15,23 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac">
-      <Version>8.0.0</Version>
+      <Version>8.1.1</Version>
     </PackageReference>
     <PackageReference Include="MailKit">
-      <Version>4.4.0</Version>
+      <Version>4.8.0</Version>
     </PackageReference>
     <PackageReference Include="MimeKit">
-      <Version>4.4.0</Version>
+      <Version>4.8.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
-    <PackageReference Include="Polly" Version="8.3.1" />
+    <PackageReference Include="Polly" Version="8.4.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
+    <PackageReference Update="Serilog" Version="4.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Papercut.Service/Papercut.Service.csproj b/src/Papercut.Service/Papercut.Service.csproj
@@ -25,14 +25,14 @@
 		</Content>
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
+		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
 		<PackageReference Include="AutofacSerilogIntegration" Version="5.0.0" />
 		<PackageReference Include="ElectronNET.API" Version="23.6.2" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
-		<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1" />
+		<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
 		<PackageReference Include="Serilog.ExceptionalLogContext" Version="1.1.0" />
-		<PackageReference Include="Serilog.Sinks.Seq" Version="7.0.0" />
-		<PackageReference Include="Serilog.Expressions" Version="4.0.0" />
+		<PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
+		<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
 		<PackageReference Include="SmtpServer" Version="10.0.1" />
 	</ItemGroup>
 	<ItemGroup>
@@ -60,4 +60,8 @@
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>
 	</ItemGroup>
+	<ItemGroup>
+	  <PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
+	  <PackageReference Update="Serilog" Version="4.0.2" />
+	</ItemGroup>
 </Project>
diff --git a/src/Papercut.UI/AppLayer/NewVersionCheck/NewVersionCheckHandler.cs b/src/Papercut.UI/AppLayer/NewVersionCheck/NewVersionCheckHandler.cs
@@ -19,18 +19,18 @@
 using Autofac;
 using Autofac.Util;
 
-using Microsoft.Extensions.Logging;
-
 using NuGet.Versioning;
 
 using Papercut.Core.Infrastructure.Container;
 using Papercut.Domain.LifecycleHooks;
 
 using Velopack;
 
+using ILogger = Serilog.ILogger;
+
 namespace Papercut.AppLayer.NewVersionCheck;
 
-public class NewVersionCheckHandler(ILogger<NewVersionCheckHandler> logger) : Disposable, IAppLifecycleStarted, INewVersionProvider
+public class NewVersionCheckHandler(UpdateManager updateManager, ILogger logger) : Disposable, IAppLifecycleStarted, INewVersionProvider
 {
     private readonly CancellationTokenSource _cancellationTokenSource = new();
 
@@ -40,39 +40,39 @@ public class NewVersionCheckHandler(ILogger<NewVersionCheckHandler> logger) : Di
 
     public Task OnStartedAsync()
     {
-        this._backgroundTask = Task.Run(this.RunNewVersionCheck, this._cancellationTokenSource.Token);
+        _backgroundTask = Task.Run(RunNewVersionCheck, _cancellationTokenSource.Token);
 
-        return this._backgroundTask.IsCompleted ? this._backgroundTask : Task.CompletedTask;
+        return _backgroundTask.IsCompleted ? _backgroundTask : Task.CompletedTask;
     }
 
     public async Task<UpdateInfo?> GetLatestVersionAsync(CancellationToken token = default)
     {
-        return await this._updateTask.Task;
+        return await _updateTask.Task;
     }
 
     protected override async ValueTask DisposeAsync(bool disposing)
     {
         if (disposing)
         {
-            if (this._backgroundTask != null)
+            if (_backgroundTask != null)
             {
-                await this._cancellationTokenSource.CancelAsync();
+                await _cancellationTokenSource.CancelAsync();
 
                 try
                 {
-                    await this._backgroundTask;
+                    await _backgroundTask;
                 }
                 catch (Exception)
                 {
                     // nothing
                 }
             }
 
-            this._updateTask.SetCanceled();
+            _updateTask.SetCanceled();
 
             try
             {
-                await this._updateTask.Task;
+                await _updateTask.Task;
             }
             catch (Exception)
             {
@@ -83,35 +83,33 @@ protected override async ValueTask DisposeAsync(bool disposing)
 
     private async Task RunNewVersionCheck()
     {
-        var mgr = new UpdateManager("https://github.com/ChangemakerStudios/Papercut-SMTP", logger: logger);
-
-        if (mgr.IsInstalled)
+        if (updateManager.IsInstalled)
         {
             try
             {
                 // check for new version
-                var newVersion = await mgr.CheckForUpdatesAsync();
+                var newVersion = await updateManager.CheckForUpdatesAsync();
                 if (newVersion != null)
                 {
-                    logger.LogInformation("New Version of Papercut SMTP is Available {@NewVersion}", newVersion);
+                    logger.Information("New Version of Papercut SMTP is Available {@NewVersion}", newVersion);
 
-                    this._updateTask.SetResult(newVersion);
+                    _updateTask.SetResult(newVersion);
                 }
             }
             catch (Exception ex)
             {
-                this._updateTask.SetException(ex);
+                _updateTask.SetException(ex);
             }
         }
         else
         {
-            logger.LogDebug("Papercut was not installed via Velopack. Cannot check for new versions.");
+            logger.Debug("Papercut was not installed via Velopack. Cannot check for new versions.");
         }
 
         this._updateTask.SetResult(null);
 
         // for testing
-        //this._updateTask.SetResult(new UpdateInfo(new VelopackAsset() { Version = new SemanticVersion(10, 0, 0) }, false));
+        //_updateTask.SetResult(new UpdateInfo(new VelopackAsset() { Version = new SemanticVersion(10, 0, 0) }, false));
     }
 
     #region Begin Static Container Registrations
diff --git a/src/Papercut.UI/Domain/UiCommands/Commands/ShowMainWindowCommand.cs b/src/Papercut.UI/Domain/UiCommands/Commands/ShowMainWindowCommand.cs
@@ -20,12 +20,7 @@
 
 namespace Papercut.Domain.UiCommands.Commands;
 
-public class ShowMainWindowCommand : IEvent
+public class ShowMainWindowCommand(bool selectMostRecentMessage = false) : IEvent
 {
-    public ShowMainWindowCommand(bool selectMostRecentMessage = false)
-    {
-        this.SelectMostRecentMessage = selectMostRecentMessage;
-    }
-
-    public bool SelectMostRecentMessage { get; set; }
+    public bool SelectMostRecentMessage { get; set; } = selectMostRecentMessage;
 }
diff --git a/src/Papercut.UI/Domain/UiCommands/Commands/ShowMessageCommand.cs b/src/Papercut.UI/Domain/UiCommands/Commands/ShowMessageCommand.cs
@@ -20,15 +20,9 @@
 
 namespace Papercut.Domain.UiCommands.Commands;
 
-public class ShowMessageCommand : ICommand
+public class ShowMessageCommand(string messageText, string caption) : ICommand
 {
-    public ShowMessageCommand(string messageText, string caption)
-    {
-        this.MessageText = messageText;
-        this.Caption = caption;
-    }
+    public string MessageText { get; set; } = messageText;
 
-    public string MessageText { get; set; }
-
-    public string Caption { get; set; }
+    public string Caption { get; set; } = caption;
 }
diff --git a/src/Papercut.UI/Papercut.csproj b/src/Papercut.UI/Papercut.csproj
@@ -51,23 +51,23 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Analects.Caliburn.Micro.Autofac" Version="1.0.0" />
-		<PackageReference Include="Autofac" Version="8.0.0" />
+		<PackageReference Include="Autofac" Version="8.1.1" />
 		<PackageReference Include="AvalonEdit" Version="6.3.0.90" />
-		<PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
+		<PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
 		<PackageReference Include="Caliburn.Micro" Version="4.0.212" />
-		<PackageReference Include="Extended.Wpf.Toolkit" Version="4.6.0" />
-		<PackageReference Include="LiteDB" Version="5.0.19" />
+		<PackageReference Include="Extended.Wpf.Toolkit" Version="4.6.1" />
+		<PackageReference Include="LiteDB" Version="5.0.21" />
 		<PackageReference Include="MahApps.Metro" Version="2.4.10" />
-		<PackageReference Include="MahApps.Metro.IconPacks" Version="4.11.0" />
-		<PackageReference Include="MimeKit" Version="4.5.0" />
-		<PackageReference Include="ReactiveUI.WPF" Version="20.0.1" />
-		<PackageReference Include="Serilog.Sinks.Observable" Version="2.0.2" />
+		<PackageReference Include="MahApps.Metro.IconPacks" Version="5.0.0" />
+		<PackageReference Include="MimeKit" Version="4.8.0" />
+		<PackageReference Include="ReactiveUI.WPF" Version="20.1.63" />
+		<PackageReference Include="Serilog.Sinks.Observable" Version="3.0.0" />
 		<PackageReference Include="Handlebars.Net" Version="2.1.6" />
-		<PackageReference Include="Microsoft.Web.WebView2" Verson="1.0.1462.37" Version="1.0.2478.35" />
-		<PackageReference Include="Serilog.Sinks.Seq" Version="7.0.1" />
+		<PackageReference Include="Microsoft.Web.WebView2" Verson="1.0.1462.37" Version="1.0.2792.45" />
+		<PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-		<PackageReference Include="Velopack" Version="0.0.359" />
+		<PackageReference Include="Velopack" Version="0.0.626" />
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="Resources\attachment-icon.png" />
@@ -88,4 +88,8 @@
 	    <LastGenOutput>Settings.Designer.cs</LastGenOutput>
 	  </None>
 	</ItemGroup>
+	<ItemGroup>
+	  <PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />
+	  <PackageReference Update="Serilog" Version="4.0.2" />
+	</ItemGroup>
 </Project>
diff --git a/src/Papercut.UI/PapercutUIModule.cs b/src/Papercut.UI/PapercutUIModule.cs
diff --git a/src/Papercut.UI/Readme.eml b/src/Papercut.UI/Readme.eml
diff --git a/src/Papercut.UI/ViewModels/MainViewModel.cs b/src/Papercut.UI/ViewModels/MainViewModel.cs
diff --git a/src/Papercut.UI/ViewModels/MessageDetailHtmlViewModel.cs b/src/Papercut.UI/ViewModels/MessageDetailHtmlViewModel.cs
diff --git a/src/Papercut.UI/Views/MainView.xaml b/src/Papercut.UI/Views/MainView.xaml
