[#494] [add] impl

Author: i4004

.vscode/settings.json

@@ -18,6 +18,7 @@
 		"seealso",
 		"serializer",
 		"SMTP",
+		"snupkg",
 		"typeparam",
 		"Сonveyor"
 	]

src/Simplify.Mail.IntegrationTests/App.config

@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
 using NUnit.Framework;
 using Simplify.DI;
 using Simplify.DI.Provider.DryIoc;
@@ -10,27 +11,41 @@ namespace Simplify.Mail.IntegrationTests;
 [Category("Integration")]
 public class MailSenderTests
 {
-	[Test]
-	public void SendSimpleTestEmail()
+	private IConfiguration _configuration;
+	private IMailSender _mailSender;
+
+	[SetUp]
+	public void Setup()
 	{
-		MailSender.Default.Send("[email protected]", "[email protected]", "Hello subject", "Hello World!!!");
+		_configuration = new ConfigurationBuilder()
+			.AddJsonFile("appsettings.json")
+			.Build();
+
+		_mailSender = new MailSender(_configuration);
 	}
 
-	[Test]
-	public Task SendSimpleAsyncTestEmail()
+	[TearDown]
+	public void TearDown()
 	{
-		return MailSender.Default.SendAsync("[email protected]",
-			"[email protected]", "Hello subject", "Hello World!!!");
+		_mailSender.Dispose();
 	}
 
+	[Test]
+	public void SendSimpleTestEmail() =>
+		_mailSender.Send("[email protected]", "[email protected]", "Hello subject", "Hello World!!!");
+
+	[Test]
+	public async Task SendSimpleAsyncTestEmail() =>
+		await _mailSender.SendAsync("[email protected]", "[email protected]", "Hello subject", "Hello World!!!");
+
 	[Test]
 	public async Task SendAsync_TwoDuplicates_OneSend()
 	{
 		// Arrange
 
 		var container = new DryIocDIProvider();
 
-		container.Register<IMailSender>(r => new MailSender());
+		container.Register<IMailSender>(r => new MailSender(_configuration));
 		container.Verify();
 
 		const string from = "[email protected]";

src/Simplify.Mail.IntegrationTests/MailSenderTests.cs

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net48</TargetFrameworks>
+		<TargetFramework>net9.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 
 		<Authors>Alexander Krylkov</Authors>
@@ -12,9 +12,15 @@
 		<ProjectReference Include="..\Simplify.Mail\Simplify.Mail.csproj" />
 	</ItemGroup>
 	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.*" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.*" />
 		<PackageReference Include="NUnit" Version="4.4.*" />
 		<PackageReference Include="NUnit3TestAdapter" Version="5.2.*" />
 		<PackageReference Include="Simplify.DI" Version="4.2.*" />
 	</ItemGroup>
+	<ItemGroup>
+		<None Update="appsettings.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
 </Project>

src/Simplify.Mail.IntegrationTests/Simplify.Mail.IntegrationTests.csproj

@@ -0,0 +1,7 @@
+{
+	"MailSenderSettings": {
+		"SmtpServerAddress": "localhost",
+		"SmtpUserName": "test",
+		"SmtpUserPassword": "test"
+	}
+}

src/Simplify.Mail.IntegrationTests/appsettings.json

@@ -1,5 +1,15 @@
 # Changelog
 
+## [2.0] - Unreleased
+
+### Breaking change
+
+- Switched from System.Net.Mail to MimeKit
+
+### Removed
+
+- System.Configuration.ConfigurationManager base configuration support
+
 ## [1.6.0] - 2025-06-15
 
 ### Removed

src/Simplify.Mail/CHANGELOG.md

@@ -1,14 +1,17 @@
-using System.Collections.Generic;
-using System.Net.Mail;
+using System;
+using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
+using MailKit.Net.Smtp;
+using MimeKit;
 using Simplify.Mail.Settings;
 
 namespace Simplify.Mail;
 
 /// <summary>
 /// Represent E-mail sending interface.
 /// </summary>
-public interface IMailSender
+public interface IMailSender : IDisposable
 {
 	/// <summary>
 	/// MailSender settings.
@@ -25,31 +28,33 @@ public interface IMailSender
 	/// Send single e-mail.
 	/// </summary>
 	/// <param name="client">Smtp client.</param>
-	/// <param name="mailMessage">The mail message.</param>
+	/// <param name="mimeMessage">The MIME message.</param>
 	/// <param name="bodyForAntiSpam">Part of an e-mail body just for anti-spam checking.</param>
-	void Send(SmtpClient client, MailMessage mailMessage, string bodyForAntiSpam = null);
+	void Send(SmtpClient client, MimeMessage mimeMessage, string bodyForAntiSpam = null);
 
 	/// <summary>
 	/// Send single e-mail asynchronously.
 	/// </summary>
 	/// <param name="client">Smtp client.</param>
-	/// <param name="mailMessage">The mail message.</param>
+	/// <param name="mimeMessage">The MIME message.</param>
 	/// <param name="bodyForAntiSpam">Part of an e-mail body just for anti-spam checking.</param>
-	Task SendAsync(SmtpClient client, MailMessage mailMessage, string bodyForAntiSpam = null);
+	/// <param name="cancellationToken">The cancellation token.</param>
+	Task SendAsync(SmtpClient client, MimeMessage mimeMessage, string bodyForAntiSpam = null, CancellationToken cancellationToken = default);
 
 	/// <summary>
 	/// Send single e-mail.
 	/// </summary>
-	/// <param name="mailMessage">The mail message.</param>
+	/// <param name="mimeMessage">The MIME message.</param>
 	/// <param name="bodyForAntiSpam">Part of an e-mail body just for anti-spam checking.</param>
-	void Send(MailMessage mailMessage, string bodyForAntiSpam = null);
+	void Send(MimeMessage mimeMessage, string bodyForAntiSpam = null);
 
 	/// <summary>
 	/// Send single e-mail asynchronously.
 	/// </summary>
-	/// <param name="mailMessage">The mail message.</param>
+	/// <param name="mimeMessage">The MIME message.</param>
 	/// <param name="bodyForAntiSpam">Part of an e-mail body just for anti-spam checking.</param>
-	Task SendAsync(MailMessage mailMessage, string bodyForAntiSpam = null);
+	/// <param name="cancellationToken">The cancellation token.</param>
+	Task SendAsync(MimeMessage mimeMessage, string bodyForAntiSpam = null, CancellationToken cancellationToken = default);
 
 	/// <summary>
 	/// Send single e-mail.
@@ -65,7 +70,7 @@ public interface IMailSender
 	/// Process status, <see langword="true" /> if message is processed to sent successfully
 	/// </returns>
 	void Send(SmtpClient client, string from, string to, string subject, string body, string bodyForAntiSpam = null,
-		params Attachment[] attachments);
+		params MimeEntity[] attachments);
 
 	/// <summary>
 	/// Send single e-mail asynchronously.
@@ -77,11 +82,12 @@ void Send(SmtpClient client, string from, string to, string subject, string body
 	/// <param name="body">e-mail body.</param>
 	/// <param name="bodyForAntiSpam">Part of an e-mail body just for anti-spam checking.</param>
 	/// <param name="attachments">The attachments to an e-mail.</param>
+	/// <param name="cancellationToken">The cancellation token.</param>
 	/// <returns>
 	/// Process status, <see langword="true" /> if message is processed to sent successfully
 	/// </returns>
 	Task SendAsync(SmtpClient client, string from, string to, string subject, string body, string bodyForAntiSpam = null,
-		params Attachment[] attachments);
+		MimeEntity[] attachments = null, CancellationToken cancellationToken = default);
 
 	/// <summary>
 	/// Send single e-mail.
@@ -94,7 +100,7 @@ Task SendAsync(SmtpClient client, string from, string to, string subject, string
 	/// <param name="attachments">The attachments to an e-mail.</param>
 	/// <returns>Process status, <see langword="true"/> if message is processed to sent successfully</returns>
 	void Send(string from, string to, string subject, string body, string bodyForAntiSpam = null,
-		params Attachment[] attachments);
+		params MimeEntity[] attachments);
 
 	/// <summary>
 	/// Send single e-mail asynchronously.
@@ -105,9 +111,10 @@ void Send(string from, string to, string subject, string body, string bodyForAnt
 	/// <param name="body">e-mail body.</param>
 	/// <param name="bodyForAntiSpam">Part of an e-mail body just for anti-spam checking.</param>
 	/// <param name="attachments">The attachments to an e-mail.</param>
+	/// <param name="cancellationToken">The cancellation token.</param>
 	/// <returns>Process status, <see langword="true"/> if message is processed to sent successfully</returns>
 	Task SendAsync(string from, string to, string subject, string body, string bodyForAntiSpam = null,
-		params Attachment[] attachments);
+		MimeEntity[] attachments = null, CancellationToken cancellationToken = default);
 
 	/// <summary>
 	/// Send e-mail to multiple recipients in one e-mail.
@@ -121,7 +128,7 @@ Task SendAsync(string from, string to, string subject, string body, string bodyF
 	/// <param name="attachments">The attachments to an e-mail.</param>
 	/// <returns>Process status, <see langword="true"/> if all messages are processed to sent successfully</returns>
 	void Send(SmtpClient client, string fromMailAddress, IList<string> addresses, string subject, string body,
-		string bodyForAntiSpam = null, params Attachment[] attachments);
+		string bodyForAntiSpam = null, params MimeEntity[] attachments);
 
 	/// <summary>
 	/// Send e-mail to multiple recipients in one e-mail asynchronously.
@@ -133,9 +140,10 @@ void Send(SmtpClient client, string fromMailAddress, IList<string> addresses, st
 	/// <param name="body">e-mail body.</param>
 	/// <param name="bodyForAntiSpam">Part of an e-mail body just for anti-spam checking.</param>
 	/// <param name="attachments">The attachments to an e-mail.</param>
+	/// <param name="cancellationToken">The cancellation token.</param>
 	/// <returns>Process status, <see langword="true"/> if all messages are processed to sent successfully</returns>
 	Task SendAsync(SmtpClient client, string fromMailAddress, IList<string> addresses, string subject, string body,
-		string bodyForAntiSpam = null, params Attachment[] attachments);
+		string bodyForAntiSpam = null, MimeEntity[] attachments = null, CancellationToken cancellationToken = default);
 
 	/// <summary>
 	/// Send e-mail to multiple recipients in one e-mail.
@@ -148,7 +156,7 @@ Task SendAsync(SmtpClient client, string fromMailAddress, IList<string> addresse
 	/// <param name="attachments">The attachments to an e-mail.</param>
 	/// <returns>Process status, <see langword="true"/> if all messages are processed to sent successfully</returns>
 	void Send(string fromMailAddress, IList<string> addresses, string subject, string body,
-		string bodyForAntiSpam = null, params Attachment[] attachments);
+		string bodyForAntiSpam = null, params MimeEntity[] attachments);
 
 	/// <summary>
 	/// Send e-mail to multiple recipients in one e-mail asynchronously.
@@ -159,9 +167,10 @@ void Send(string fromMailAddress, IList<string> addresses, string subject, strin
 	/// <param name="body">e-mail body.</param>
 	/// <param name="bodyForAntiSpam">Part of an e-mail body just for anti-spam checking.</param>
 	/// <param name="attachments">The attachments to an e-mail.</param>
+	/// <param name="cancellationToken">The cancellation token.</param>
 	/// <returns>Process status, <see langword="true"/> if all messages are processed to sent successfully</returns>
 	Task SendAsync(string fromMailAddress, IList<string> addresses, string subject, string body,
-		string bodyForAntiSpam = null, params Attachment[] attachments);
+		string bodyForAntiSpam = null, MimeEntity[] attachments = null, CancellationToken cancellationToken = default);
 
 	/// <summary>
 	/// Send e-mail to multiple recipients and carbon copy recipients in one e-mail.
@@ -176,7 +185,7 @@ Task SendAsync(string fromMailAddress, IList<string> addresses, string subject,
 	/// <param name="attachments">The attachments to an e-mail.</param>
 	/// <returns>Process status, <see langword="true"/> if all messages are processed to sent successfully</returns>
 	void Send(SmtpClient client, string fromMailAddress, IList<string> addresses, IList<string> ccAddresses,
-		string subject, string body, string bodyForAntiSpam = null, params Attachment[] attachments);
+		string subject, string body, string bodyForAntiSpam = null, params MimeEntity[] attachments);
 
 	/// <summary>
 	/// Send e-mail to multiple recipients and carbon copy recipients in one e-mail asynchronously.
@@ -189,9 +198,10 @@ void Send(SmtpClient client, string fromMailAddress, IList<string> addresses, IL
 	/// <param name="body">e-mail body.</param>
 	/// <param name="bodyForAntiSpam">Part of an e-mail body just for anti-spam checking.</param>
 	/// <param name="attachments">The attachments to an e-mail.</param>
+	/// <param name="cancellationToken">The cancellation token.</param>
 	/// <returns>Process status, <see langword="true"/> if all messages are processed to sent successfully</returns>
 	Task SendAsync(SmtpClient client, string fromMailAddress, IList<string> addresses, IList<string> ccAddresses,
-		string subject, string body, string bodyForAntiSpam = null, params Attachment[] attachments);
+		string subject, string body, string bodyForAntiSpam = null, MimeEntity[] attachments = null, CancellationToken cancellationToken = default);
 
 	/// <summary>
 	/// Send e-mail to multiple recipients and carbon copy recipients in one e-mail.
@@ -204,7 +214,8 @@ Task SendAsync(SmtpClient client, string fromMailAddress, IList<string> addresse
 	/// <param name="bodyForAntiSpam">Part of an e-mail body just for anti-spam checking.</param>
 	/// <param name="attachments">The attachments to an e-mail.</param>
 	/// <returns>Process status, <see langword="true"/> if all messages are processed to sent successfully</returns>
-	void Send(string fromMailAddress, IList<string> addresses, IList<string> ccAddresses, string subject, string body, string bodyForAntiSpam = null, params Attachment[] attachments);
+	void Send(string fromMailAddress, IList<string> addresses, IList<string> ccAddresses, string subject, string body,
+		string bodyForAntiSpam = null, params MimeEntity[] attachments);
 
 	/// <summary>
 	/// Send e-mail to multiple recipients and carbon copy recipients in one e-mail asynchronously.
@@ -216,9 +227,10 @@ Task SendAsync(SmtpClient client, string fromMailAddress, IList<string> addresse
 	/// <param name="body">e-mail body.</param>
 	/// <param name="bodyForAntiSpam">Part of an e-mail body just for anti-spam checking.</param>
 	/// <param name="attachments">The attachments to an e-mail.</param>
+	/// <param name="cancellationToken">The cancellation token.</param>
 	/// <returns>Process status, <see langword="true"/> if all messages are processed to sent successfully</returns>
 	Task SendAsync(string fromMailAddress, IList<string> addresses, IList<string> ccAddresses, string subject, string body,
-		string bodyForAntiSpam = null, params Attachment[] attachments);
+		string bodyForAntiSpam = null, MimeEntity[] attachments = null, CancellationToken cancellationToken = default);
 
 	/// <summary>
 	/// Send e-mail to multiple recipients separately
@@ -232,7 +244,7 @@ Task SendAsync(string fromMailAddress, IList<string> addresses, IList<string> cc
 	/// <param name="attachments">The attachments to an e-mail.</param>
 	/// <returns>Process status, <see langword="true"/> if all messages are processed to sent successfully</returns>
 	void SendSeparately(SmtpClient client, string fromMailAddress, IList<string> addresses, string subject, string body,
-		string bodyForAntiSpam = null, params Attachment[] attachments);
+		string bodyForAntiSpam = null, params MimeEntity[] attachments);
 
 	/// <summary>
 	/// Send e-mail to multiple recipients separately
@@ -244,9 +256,10 @@ void SendSeparately(SmtpClient client, string fromMailAddress, IList<string> add
 	/// <param name="body">e-mail body.</param>
 	/// <param name="bodyForAntiSpam">Part of an e-mail body just for anti-spam checking.</param>
 	/// <param name="attachments">The attachments to an e-mail.</param>
+	/// <param name="cancellationToken">The cancellation token.</param>
 	/// <returns>Process status, <see langword="true"/> if all messages are processed to sent successfully</returns>
 	Task SendSeparatelyAsync(SmtpClient client, string fromMailAddress, IList<string> addresses, string subject, string body,
-		string bodyForAntiSpam = null, params Attachment[] attachments);
+		string bodyForAntiSpam = null, MimeEntity[] attachments = null, CancellationToken cancellationToken = default);
 
 	/// <summary>
 	/// Send e-mail to multiple recipients separately
@@ -259,7 +272,7 @@ Task SendSeparatelyAsync(SmtpClient client, string fromMailAddress, IList<string
 	/// <param name="attachments">The attachments to an e-mail.</param>
 	/// <returns>Process status, <see langword="true"/> if all messages are processed to sent successfully</returns>
 	void SendSeparately(string fromMailAddress, IList<string> addresses, string subject, string body,
-		string bodyForAntiSpam = null, params Attachment[] attachments);
+		string bodyForAntiSpam = null, params MimeEntity[] attachments);
 
 	/// <summary>
 	/// Send e-mail to multiple recipients separately
@@ -270,7 +283,8 @@ void SendSeparately(string fromMailAddress, IList<string> addresses, string subj
 	/// <param name="body">e-mail body.</param>
 	/// <param name="bodyForAntiSpam">Part of an e-mail body just for anti-spam checking.</param>
 	/// <param name="attachments">The attachments to an e-mail.</param>
+	/// <param name="cancellationToken">The cancellation token.</param>
 	/// <returns>Process status, <see langword="true"/> if all messages are processed to sent successfully</returns>
 	Task SendSeparatelyAsync(string fromMailAddress, IList<string> addresses, string subject, string body,
-		string bodyForAntiSpam = null, params Attachment[] attachments);
-}
+		string bodyForAntiSpam = null, MimeEntity[] attachments = null, CancellationToken cancellationToken = default);
+}