Migrated to .NET6

Author: HeyJoel

.gitignore

@@ -96,7 +96,7 @@ Desktop.ini
 # Mac crap
 .DS_Store
 
-src/.vs
+.vs
 .vscode
 
 # Cake Build

src/Cofoundry.Plugins.Mail.MailKit.sln renamed to Cofoundry.Plugins.Mail.MailKit.sln

@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.32126.315
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cofoundry.Plugins.Mail.MailKit", "Cofoundry.Plugins.Mail.MailKit\Cofoundry.Plugins.Mail.MailKit.csproj", "{8D628D8E-3AD8-4259-B08A-C7CC0FCC609D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cofoundry.Plugins.Mail.MailKit", "src\Cofoundry.Plugins.Mail.MailKit\Cofoundry.Plugins.Mail.MailKit.csproj", "{8D628D8E-3AD8-4259-B08A-C7CC0FCC609D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{DBD04643-D345-4DF5-AD0A-9A179649A4CA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MailKitExample", "MailKitExample\MailKitExample.csproj", "{B78AFB4C-1ECF-4E72-AE5E-BC6638CE12C2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MailKitExample", "src\MailKitExample\MailKitExample.csproj", "{B78AFB4C-1ECF-4E72-AE5E-BC6638CE12C2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/NuGet.config renamed to NuGet.config

@@ -1,5 +1,5 @@
 version: '{build}'
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 build_script:
 - cmd: PowerShell .\build.ps1 --PushPackages="true"

appveyor.yml

@@ -1,25 +1,19 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Cofoundry.Core.DependencyInjection;
+using Cofoundry.Core.DependencyInjection;
 using Cofoundry.Core.Mail;
 
-namespace Cofoundry.Plugins.Mail.MailKit
+namespace Cofoundry.Plugins.Mail.MailKit;
+
+public class MailKitDependencyRegistration : IDependencyRegistration
 {
-    public class MailKitDependencyRegistration : IDependencyRegistration
+    public void Register(IContainerRegister container)
     {
-        public void Register(IContainerRegister container)
-        {
-            if (container.Configuration.GetValue<bool>("Cofoundry:Plugins:MailKit:Disabled")) return;
+        if (container.Configuration.GetValue<bool>("Cofoundry:Plugins:MailKit:Disabled")) return;
 
-            var overrideOptions = RegistrationOptions.Override();
+        var overrideOptions = RegistrationOptions.Override();
 
-            container
-                .Register<IMailDispatchSession, MailKitMailDispatchSession>(overrideOptions)
-                .Register<ISmtpClientConnectionConfiguration, SmtpClientConnectionConfiguration>()
-                ; 
-        }
+        container
+            .Register<IMailDispatchSession, MailKitMailDispatchSession>(overrideOptions)
+            .Register<ISmtpClientConnectionConfiguration, SmtpClientConnectionConfiguration>()
+            ;
     }
 }

src/Cofoundry.Plugins.Mail.MailKit/Bootstrap/MailKitDependencyRegistration.cs

@@ -1,31 +1,26 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+namespace Cofoundry.Plugins.Mail.MailKit;
 
-namespace Cofoundry.Plugins.Mail.MailKit
+/// <summary>
+/// Used to indicate the rules to use for smtp server ssl certificate validation.
+/// </summary>
+public enum CertificateValidationMode
 {
     /// <summary>
-    /// Used to indicate the rules to use for smtp server ssl certificate validation.
+    /// Uses the default MailKit validator, which allows valid certificates
+    /// and self-signed certificates with an untrusted root.
     /// </summary>
-    public enum CertificateValidationMode
-    {
-        /// <summary>
-        /// Uses the default MailKit validator, which allows valid certificates
-        /// and self-signed certificates with an untrusted root.
-        /// </summary>
-        /// <remarks>
-        /// See https://github.com/jstedfast/MailKit/issues/307
-        /// </remarks>
-        Default,
+    /// <remarks>
+    /// See https://github.com/jstedfast/MailKit/issues/307
+    /// </remarks>
+    Default,
 
-        /// <summary>
-        /// Ignore certificate errors.
-        /// </summary>
-        All,
+    /// <summary>
+    /// Ignore certificate errors.
+    /// </summary>
+    All,
 
-        /// <summary>
-        /// Allows only valid certificates without errors.
-        /// </summary>
-        ValidOnly
-    }
+    /// <summary>
+    /// Allows only valid certificates without errors.
+    /// </summary>
+    ValidOnly
 }

src/Cofoundry.Plugins.Mail.MailKit/CertificateValidationMode.cs

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+	<ImplicitUsings>enable</ImplicitUsings>
 
     <PackageId>Cofoundry.Plugins.Mail.MailKit</PackageId>
     <Description>Cofoundry mail services that utilize the cross platform MailKit library.</Description>
@@ -11,12 +12,12 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netcoreapp3.1\Cofoundry.Plugins.Mail.MailKit.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\net6.0\Cofoundry.Plugins.Mail.MailKit.xml</DocumentationFile>
     <NoWarn>1701;1702;1705;1591</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cofoundry.Core" Version="0.10.0" />
+    <PackageReference Include="Cofoundry.Core" Version="0.10.4-ci0006" />
     <PackageReference Include="MailKit" Version="3.1.1" />
   </ItemGroup>
 

src/Cofoundry.Plugins.Mail.MailKit/Cofoundry.Plugins.Mail.MailKit.csproj

@@ -1,44 +1,39 @@
 using MailKit.Net.Smtp;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Cofoundry.Plugins.Mail.MailKit
+namespace Cofoundry.Plugins.Mail.MailKit;
+
+/// <summary>
+/// Used to configure the MailKit SmtpClient and customize the connection process.
+/// </summary>
+public interface ISmtpClientConnectionConfiguration
 {
     /// <summary>
-    /// Used to configure the MailKit SmtpClient and customize the connection process.
+    /// Initialized the SmtpClient after it has been created.
     /// </summary>
-    public interface ISmtpClientConnectionConfiguration
-    {
-        /// <summary>
-        /// Initialized the SmtpClient after it has been created.
-        /// </summary>
-        /// <param name="smtpClient">Instance to initialize.</param>
-        void Initialize(SmtpClient smtpClient);
+    /// <param name="smtpClient">Instance to initialize.</param>
+    void Initialize(SmtpClient smtpClient);
 
-        /// <summary>
-        /// Opens the SmtpClient connection to the configured host.
-        /// </summary>
-        /// <param name="smtpClient">Instance to connect with.</param>
-        void Connect(SmtpClient smtpClient);
+    /// <summary>
+    /// Opens the SmtpClient connection to the configured host.
+    /// </summary>
+    /// <param name="smtpClient">Instance to connect with.</param>
+    void Connect(SmtpClient smtpClient);
 
-        /// <summary>
-        /// Opens the SmtpClient connection to the configured host.
-        /// </summary>
-        /// <param name="smtpClient">Instance to connect with.</param>
-        Task ConnectAsync(SmtpClient smtpClient);
+    /// <summary>
+    /// Opens the SmtpClient connection to the configured host.
+    /// </summary>
+    /// <param name="smtpClient">Instance to connect with.</param>
+    Task ConnectAsync(SmtpClient smtpClient);
 
-        /// <summary>
-        /// Closes the SmtpClient connection to the configured host.
-        /// </summary>
-        /// <param name="smtpClient">Instance to close the connection for.</param>
-        void Disconnect(SmtpClient smtpClient);
+    /// <summary>
+    /// Closes the SmtpClient connection to the configured host.
+    /// </summary>
+    /// <param name="smtpClient">Instance to close the connection for.</param>
+    void Disconnect(SmtpClient smtpClient);
 
-        /// <summary>
-        /// Closes the SmtpClient connection to the configured host.
-        /// </summary>
-        /// <param name="smtpClient">Instance to close the connection for.</param>
-        Task DisconnectAsync(SmtpClient smtpClient);
-    }
+    /// <summary>
+    /// Closes the SmtpClient connection to the configured host.
+    /// </summary>
+    /// <param name="smtpClient">Instance to close the connection for.</param>
+    Task DisconnectAsync(SmtpClient smtpClient);
 }