From efe7f2aba31725213501f6f08f7c9b61d1128862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0smail=20=C3=87AGDA=C5=9E?= Date: Fri, 19 Jul 2019 10:20:23 +0300 Subject: [PATCH] follows https://github.com/abpframework/abp/commit/922af8e558462586bfa74bedaaa48cff10335942 remove MailKitSmtpEmailSender.SendMail --- .../Volo/Abp/MailKit/MailKitSmtpEmailSender.cs | 11 ----------- .../Volo/Abp/MailKit/MailKitSmtpEmailSender_Tests.cs | 10 ++++++---- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs b/framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs index 426be33c80..da99e7d4de 100644 --- a/framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs +++ b/framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs @@ -8,7 +8,6 @@ using MailKit.Security; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using MimeKit; -using Volo.Abp.Threading; using SmtpClient = MailKit.Net.Smtp.SmtpClient; namespace Volo.Abp.MailKit @@ -39,16 +38,6 @@ namespace Volo.Abp.MailKit } } - protected override void SendEmail(MailMessage mail) - { - using (var client = AsyncHelper.RunSync(BuildClientAsync)) - { - var message = MimeMessage.CreateFromMailMessage(mail); - client.Send(message); - client.Disconnect(true); - } - } - public async Task BuildClientAsync() { var client = new SmtpClient(); diff --git a/framework/test/Volo.Abp.MailKit.Tests/Volo/Abp/MailKit/MailKitSmtpEmailSender_Tests.cs b/framework/test/Volo.Abp.MailKit.Tests/Volo/Abp/MailKit/MailKitSmtpEmailSender_Tests.cs index 8404b8df4e..de9acb3a0e 100644 --- a/framework/test/Volo.Abp.MailKit.Tests/Volo/Abp/MailKit/MailKitSmtpEmailSender_Tests.cs +++ b/framework/test/Volo.Abp.MailKit.Tests/Volo/Abp/MailKit/MailKitSmtpEmailSender_Tests.cs @@ -15,19 +15,21 @@ namespace Volo.Abp.MailKit { var mailSender = CreateMailKitEmailSender(); var mailMessage = new MailMessage("from_mail_address@asd.com", "to_mail_address@asd.com", "subject", "body") - { IsBodyHtml = true }; + { IsBodyHtml = true }; await mailSender.SendAsync(mailMessage); } //[Fact] - public void ShouldSendMailMessage() + public async Task ShouldSendMailMessage() { var mailSender = CreateMailKitEmailSender(); var mailMessage = new MailMessage("from_mail_address@asd.com", "to_mail_address@asd.com", "subject", "body") - { IsBodyHtml = true }; + { + IsBodyHtml = true + }; - mailSender.Send(mailMessage); + await mailSender.SendAsync(mailMessage); } private static MailKitSmtpEmailSender CreateMailKitEmailSender()