diff --git a/hmailserver/source/Tools/ControlPanel/ControlPanel.csproj b/hmailserver/source/Tools/ControlPanel/ControlPanel.csproj
index 0dd189b2..ca868cdb 100644
--- a/hmailserver/source/Tools/ControlPanel/ControlPanel.csproj
+++ b/hmailserver/source/Tools/ControlPanel/ControlPanel.csproj
@@ -1,30 +1,30 @@
-
-
-
- WinExe
- net8.0-windows
- true
- x64
- x64
- disable
- enable
- hMailCP
- hMailServer.ControlPanel
- app.manifest
- app.ico
- 6.2.7
- hMailServer Control Panel
- Progressive Robot Ltd
- Copyright (c) 2026 Christopher Holloway / Progressive Robot Ltd
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ WinExe
+ net8.0-windows
+ true
+ x64
+ x64
+ disable
+ enable
+ hMailCP
+ hMailServer.ControlPanel
+ app.manifest
+ app.ico
+ 6.2.7
+ hMailServer Control Panel
+ Progressive Robot Ltd
+ Copyright (c) 2026 Christopher Holloway / Progressive Robot Ltd
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hmailserver/test/RegressionTests/RegressionTests.csproj b/hmailserver/test/RegressionTests/RegressionTests.csproj
index 81768257..64ae3a23 100644
--- a/hmailserver/test/RegressionTests/RegressionTests.csproj
+++ b/hmailserver/test/RegressionTests/RegressionTests.csproj
@@ -1,302 +1,534 @@
-
-
-
-
-
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {8F691179-0851-4A25-AC78-3548DD0514FA}
- Library
- Properties
- RegressionTests
- RegressionTests
- true
-
-
- 3.5
-
-
- http://localhost/UnitTest/
- true
- Web
- true
- Foreground
- 7
- Days
- false
- false
- true
- 0
- 1.0.0.%2a
- false
- true
- v4.8.1
-
-
-
-
-
- true
- bin\x64\Debug\
- DEBUG;TRACE
- full
- x64
- prompt
- MinimumRecommendedRules.ruleset
- false
-
-
- bin\x64\Release\
- TRACE
- true
- pdbonly
- x64
- prompt
- MinimumRecommendedRules.ruleset
- false
-
-
-
-
- ..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- True
- True
- TestResources.resx
-
-
-
-
- {DB241B59-A1B1-4C59-98FC-8D101A2995F2}
- 1
- 0
- 0
- tlbimp
- False
-
-
-
-
-
-
-
-
-
- False
- .NET Framework 2.0 %28x86%29
- true
-
-
- False
- .NET Framework 3.0 %28x86%29
- false
-
-
- False
- .NET Framework 3.5
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ResXFileCodeGenerator
- TestResources.Designer.cs
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
+
+
+
+
+
+
+
+
+ Debug
+ AnyCPU
+ 9.0.30729
+ 2.0
+ {8F691179-0851-4A25-AC78-3548DD0514FA}
+ Library
+ Properties
+ RegressionTests
+ RegressionTests
+ true
+
+
+ 3.5
+
+
+ http://localhost/UnitTest/
+ true
+ Web
+ true
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ true
+ v4.8.1
+
+
+
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+ false
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+ false
+
+
+
+ ..\packages\Azure.Core.1.59.0\lib\net472\Azure.Core.dll
+ True
+
+
+ ..\packages\Azure.Monitor.OpenTelemetry.Exporter.1.8.1\lib\netstandard2.0\Azure.Monitor.OpenTelemetry.Exporter.dll
+ True
+
+
+ ..\packages\Microsoft.ApplicationInsights.3.1.2\lib\net462\Microsoft.ApplicationInsights.dll
+ True
+
+
+ ..\packages\Microsoft.Bcl.AsyncInterfaces.10.0.9\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Configuration.10.0.9\lib\net462\Microsoft.Extensions.Configuration.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Configuration.Abstractions.10.0.9\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Configuration.Binder.10.0.9\lib\net462\Microsoft.Extensions.Configuration.Binder.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.DependencyInjection.10.0.9\lib\net462\Microsoft.Extensions.DependencyInjection.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.10.0.9\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Diagnostics.Abstractions.10.0.9\lib\net462\Microsoft.Extensions.Diagnostics.Abstractions.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.FileProviders.Abstractions.10.0.9\lib\net462\Microsoft.Extensions.FileProviders.Abstractions.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Hosting.Abstractions.10.0.9\lib\net462\Microsoft.Extensions.Hosting.Abstractions.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Logging.10.0.9\lib\net462\Microsoft.Extensions.Logging.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Logging.Abstractions.10.0.9\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Logging.Configuration.10.0.9\lib\net462\Microsoft.Extensions.Logging.Configuration.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Options.10.0.9\lib\net462\Microsoft.Extensions.Options.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.10.0.9\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll
+ True
+
+
+ ..\packages\Microsoft.Extensions.Primitives.10.0.9\lib\net462\Microsoft.Extensions.Primitives.dll
+ True
+
+
+ ..\packages\Microsoft.Identity.Client.4.85.0\lib\net472\Microsoft.Identity.Client.dll
+ True
+
+
+ ..\packages\Microsoft.Identity.Client.Extensions.Msal.4.85.0\lib\netstandard2.0\Microsoft.Identity.Client.Extensions.Msal.dll
+ True
+
+
+ ..\packages\Microsoft.IdentityModel.Abstractions.8.19.1\lib\net472\Microsoft.IdentityModel.Abstractions.dll
+ True
+
+
+ ..\packages\Microsoft.Testing.Platform.MSBuild.2.2.3\lib\netstandard2.0\Microsoft.Testing.Extensions.MSBuild.dll
+ True
+
+
+ ..\packages\Microsoft.Testing.Extensions.Telemetry.2.2.3\lib\netstandard2.0\Microsoft.Testing.Extensions.Telemetry.dll
+ True
+
+
+ ..\packages\Microsoft.Testing.Extensions.TrxReport.Abstractions.2.2.3\lib\netstandard2.0\Microsoft.Testing.Extensions.TrxReport.Abstractions.dll
+ True
+
+
+ ..\packages\Microsoft.Testing.Extensions.VSTestBridge.2.2.3\lib\netstandard2.0\Microsoft.Testing.Extensions.VSTestBridge.dll
+ True
+
+
+ ..\packages\Microsoft.Testing.Platform.2.2.3\lib\netstandard2.0\Microsoft.Testing.Platform.dll
+ True
+
+
+ ..\packages\Microsoft.TestPlatform.ObjectModel.18.6.0\lib\net462\Microsoft.TestPlatform.CoreUtilities.dll
+ True
+
+
+ ..\packages\Microsoft.TestPlatform.ObjectModel.18.6.0\lib\net462\Microsoft.TestPlatform.PlatformAbstractions.dll
+ True
+
+
+
+ ..\packages\Microsoft.TestPlatform.ObjectModel.18.6.0\lib\net462\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
+ True
+
+
+ ..\packages\NUnit.4.6.1\lib\net462\nunit.framework.dll
+ True
+
+
+ ..\packages\NUnit.4.6.1\lib\net462\nunit.framework.legacy.dll
+ True
+
+
+ ..\packages\OpenTelemetry.1.16.0\lib\net462\OpenTelemetry.dll
+ True
+
+
+ ..\packages\OpenTelemetry.Api.1.16.0\lib\net462\OpenTelemetry.Api.dll
+ True
+
+
+ ..\packages\OpenTelemetry.Api.ProviderBuilderExtensions.1.16.0\lib\net462\OpenTelemetry.Api.ProviderBuilderExtensions.dll
+ True
+
+
+ ..\packages\OpenTelemetry.Extensions.Hosting.1.16.0\lib\net462\OpenTelemetry.Extensions.Hosting.dll
+ True
+
+
+ ..\packages\OpenTelemetry.PersistentStorage.Abstractions.1.1.0\lib\net462\OpenTelemetry.PersistentStorage.Abstractions.dll
+ True
+
+
+ ..\packages\OpenTelemetry.PersistentStorage.FileSystem.1.1.0\lib\net462\OpenTelemetry.PersistentStorage.FileSystem.dll
+ True
+
+
+
+ ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll
+ True
+
+
+ ..\packages\System.ClientModel.1.14.0\lib\netstandard2.0\System.ClientModel.dll
+ True
+
+
+ ..\packages\System.Collections.Immutable.10.0.9\lib\net462\System.Collections.Immutable.dll
+ True
+
+
+ ..\packages\System.Diagnostics.DiagnosticSource.10.0.9\lib\net462\System.Diagnostics.DiagnosticSource.dll
+ True
+
+
+ ..\packages\System.Formats.Asn1.10.0.9\lib\net462\System.Formats.Asn1.dll
+ True
+
+
+ ..\packages\System.IO.FileSystem.AccessControl.5.0.0\lib\net461\System.IO.FileSystem.AccessControl.dll
+ True
+
+
+ ..\packages\System.IO.Pipelines.10.0.9\lib\net462\System.IO.Pipelines.dll
+ True
+
+
+ ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll
+ True
+
+
+ ..\packages\System.Memory.Data.10.0.9\lib\net462\System.Memory.Data.dll
+ True
+
+
+ ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll
+ True
+
+
+ ..\packages\System.Reflection.Metadata.10.0.9\lib\net462\System.Reflection.Metadata.dll
+ True
+
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll
+ True
+
+
+ ..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll
+ True
+
+
+ ..\packages\System.Security.Cryptography.ProtectedData.10.0.9\lib\net462\System.Security.Cryptography.ProtectedData.dll
+ True
+
+
+ ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll
+ True
+
+
+
+ ..\packages\System.Text.Encodings.Web.10.0.9\lib\net462\System.Text.Encodings.Web.dll
+ True
+
+
+ ..\packages\System.Text.Json.10.0.9\lib\net462\System.Text.Json.dll
+ True
+
+
+ ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll
+ True
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ True
+ True
+ TestResources.resx
+
+
+
+
+ {DB241B59-A1B1-4C59-98FC-8D101A2995F2}
+ 1
+ 0
+ 0
+ tlbimp
+ False
+
+
+
+
+
+
+
+
+
+ False
+ .NET Framework 2.0 %28x86%29
+ true
+
+
+ False
+ .NET Framework 3.0 %28x86%29
+ false
+
+
+ False
+ .NET Framework 3.5
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ResXFileCodeGenerator
+ TestResources.Designer.cs
+ Designer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hmailserver/test/RegressionTests/packages.config b/hmailserver/test/RegressionTests/packages.config
index e9c30236..348f2400 100644
--- a/hmailserver/test/RegressionTests/packages.config
+++ b/hmailserver/test/RegressionTests/packages.config
@@ -1,7 +1,58 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hmailserver/test/StressTest/StressTest.csproj b/hmailserver/test/StressTest/StressTest.csproj
index 0422603b..bbfc0f2b 100644
--- a/hmailserver/test/StressTest/StressTest.csproj
+++ b/hmailserver/test/StressTest/StressTest.csproj
@@ -1,116 +1,131 @@
-
-
-
-
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {BCB5B5E3-291F-475E-8200-32C918FB95C1}
- Library
- Properties
- StressTest
- StressTest
- v4.8
- 512
-
-
-
-
-
-
- 3.5
-
-
-
-
-
- true
- bin\x64\Debug\
- DEBUG;TRACE
- true
- full
- x64
- prompt
- MinimumRecommendedRules.ruleset
-
-
- bin\x64\Release\
- TRACE
- true
- true
- pdbonly
- x64
- prompt
- MinimumRecommendedRules.ruleset
-
-
-
-
- ..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll
-
-
-
- 3.5
-
-
-
- 3.5
-
-
- 3.5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {DB241B59-A1B1-4C59-98FC-8D101A2995F2}
- 1
- 0
- 0
- tlbimp
- False
-
-
-
-
- {CBDEF4D1-5545-4693-B6DF-17D6EDE484CF}
- hMailServer.Test.Infrastructure
-
-
- {8f691179-0851-4a25-ac78-3548dd0514fa}
- RegressionTests
-
-
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
+
+
+
+
+ Debug
+ AnyCPU
+ 9.0.30729
+ 2.0
+ {BCB5B5E3-291F-475E-8200-32C918FB95C1}
+ Library
+ Properties
+ StressTest
+ StressTest
+ v4.8
+ 512
+
+
+
+
+
+
+ 3.5
+
+
+
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ true
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ true
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+
+
+ ..\packages\NUnit.4.6.1\lib\net462\nunit.framework.dll
+ True
+
+
+ ..\packages\NUnit.4.6.1\lib\net462\nunit.framework.legacy.dll
+ True
+
+
+
+ 3.5
+
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll
+ True
+
+
+
+ ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll
+ True
+
+
+ 3.5
+
+
+ 3.5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {DB241B59-A1B1-4C59-98FC-8D101A2995F2}
+ 1
+ 0
+ 0
+ tlbimp
+ False
+
+
+
+
+ {CBDEF4D1-5545-4693-B6DF-17D6EDE484CF}
+ hMailServer.Test.Infrastructure
+
+
+ {8f691179-0851-4a25-ac78-3548dd0514fa}
+ RegressionTests
+
+
+
+
+
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.
+
+
+
+
\ No newline at end of file
diff --git a/hmailserver/test/StressTest/packages.config b/hmailserver/test/StressTest/packages.config
index bdef499b..182794e2 100644
--- a/hmailserver/test/StressTest/packages.config
+++ b/hmailserver/test/StressTest/packages.config
@@ -1,5 +1,8 @@
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hmailserver/test/VMTestRunner.Console/VMTestRunner.Console.csproj b/hmailserver/test/VMTestRunner.Console/VMTestRunner.Console.csproj
index 026b10a3..4ce8768d 100644
--- a/hmailserver/test/VMTestRunner.Console/VMTestRunner.Console.csproj
+++ b/hmailserver/test/VMTestRunner.Console/VMTestRunner.Console.csproj
@@ -1,91 +1,93 @@
-
-
-
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {6F5E4D3C-2B1A-0F9E-8D7C-6B5A4F3E2D1C}
- Exe
- Properties
- VMTestRunner.Console
- VMTestRunner.Console
- v4.8
- 512
-
-
-
- true
- bin\x64\Debug\
- DEBUG;TRACE
- full
- x64
- prompt
- MinimumRecommendedRules.ruleset
-
-
- bin\x64\Release\
- TRACE
- true
- pdbonly
- x64
- prompt
- MinimumRecommendedRules.ruleset
-
-
-
- ..\packages\CommandLineParser.2.9.1\lib\net461\CommandLine.dll
-
-
- ..\packages\NLog.5.0.1\lib\net46\NLog.dll
-
-
-
-
- 3.5
-
-
-
- 3.5
-
-
-
-
- 3.5
-
-
-
- ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll
-
-
-
-
- RetryHelper.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- PreserveNewest
-
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
-
+
+
+
+ Debug
+ AnyCPU
+ 9.0.30729
+ 2.0
+ {6F5E4D3C-2B1A-0F9E-8D7C-6B5A4F3E2D1C}
+ Exe
+ Properties
+ VMTestRunner.Console
+ VMTestRunner.Console
+ v4.8
+ 512
+
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+
+ ..\packages\CommandLineParser.2.9.1\lib\net461\CommandLine.dll
+
+
+ ..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll
+ True
+
+
+ ..\packages\NLog.6.1.3\lib\net46\NLog.dll
+ True
+
+
+
+
+ 3.5
+
+
+
+ 3.5
+
+
+
+
+ 3.5
+
+
+
+
+
+ RetryHelper.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PreserveNewest
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
\ No newline at end of file
diff --git a/hmailserver/test/VMTestRunner.Console/app.config b/hmailserver/test/VMTestRunner.Console/app.config
index 3e0e37cf..834a0313 100644
--- a/hmailserver/test/VMTestRunner.Console/app.config
+++ b/hmailserver/test/VMTestRunner.Console/app.config
@@ -1,3 +1,12 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hmailserver/test/VMTestRunner.Console/packages.config b/hmailserver/test/VMTestRunner.Console/packages.config
index ddba2a36..19349381 100644
--- a/hmailserver/test/VMTestRunner.Console/packages.config
+++ b/hmailserver/test/VMTestRunner.Console/packages.config
@@ -1,6 +1,6 @@
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file