diff --git a/src/Orchard.Web/Modules/Markdown/Markdown.csproj b/src/Orchard.Web/Modules/Markdown/Markdown.csproj
index 21462fb8660..d27fe18456b 100644
--- a/src/Orchard.Web/Modules/Markdown/Markdown.csproj
+++ b/src/Orchard.Web/Modules/Markdown/Markdown.csproj
@@ -67,8 +67,8 @@
-
- ..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll
+
+ ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll
@@ -231,4 +231,4 @@
-
+
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Markdown/Web.config b/src/Orchard.Web/Modules/Markdown/Web.config
index 836843e000d..8f78a222e81 100644
--- a/src/Orchard.Web/Modules/Markdown/Web.config
+++ b/src/Orchard.Web/Modules/Markdown/Web.config
@@ -68,6 +68,10 @@
+
+
+
+
diff --git a/src/Orchard.Web/Modules/Markdown/packages.config b/src/Orchard.Web/Modules/Markdown/packages.config
index e11111c3946..dd60683feba 100644
--- a/src/Orchard.Web/Modules/Markdown/packages.config
+++ b/src/Orchard.Web/Modules/Markdown/packages.config
@@ -7,7 +7,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
index d5dcfd97db3..0b5bd52690d 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
@@ -55,8 +55,8 @@
..\..\..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll
-
- ..\..\..\packages\MailKit.3.1.1\lib\net48\MailKit.dll
+
+ ..\..\..\packages\MailKit.3.4.2\lib\net48\MailKit.dll
..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
@@ -65,8 +65,8 @@
..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
-
- ..\..\..\packages\MimeKit.3.1.1\lib\net48\MimeKit.dll
+
+ ..\..\..\packages\MimeKit.3.4.2\lib\net48\MimeKit.dll
..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
@@ -80,8 +80,21 @@
+
+ ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll
+
+
+
+ ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
+
+
+ ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+
+ ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
+
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs b/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
index afa9b93f172..f2b0fafb750 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
@@ -14,11 +14,10 @@
using SmtpClient = MailKit.Net.Smtp.SmtpClient;
namespace Orchard.Email.Services {
- public class SmtpMessageChannel : Component, ISmtpChannel, IDisposable {
+ public class SmtpMessageChannel : Component, ISmtpChannel {
private readonly SmtpSettingsPart _smtpSettings;
private readonly IShapeFactory _shapeFactory;
private readonly IShapeDisplay _shapeDisplay;
- private readonly Lazy _smtpClientField;
public static readonly string MessageType = "Email";
public SmtpMessageChannel(
@@ -30,15 +29,6 @@ public SmtpMessageChannel(
_shapeDisplay = shapeDisplay;
_smtpSettings = orchardServices.WorkContext.CurrentSite.As();
- _smtpClientField = new Lazy(CreateSmtpClient);
- }
-
- public void Dispose() {
- if (!_smtpClientField.IsValueCreated) {
- return;
- }
-
- _smtpClientField.Value.Dispose();
}
public void Process(IDictionary parameters) {
@@ -116,7 +106,11 @@ public void Process(IDictionary parameters) {
mailMessage.ReplyTo.AddRange(ParseRecipients(emailMessage.ReplyTo));
}
- _smtpClientField.Value.Send(mailMessage);
+ using (var smtpClient = CreateSmtpClient()) {
+ // CreateSmtpClient handles connection and authentication as well
+ smtpClient.Send(mailMessage);
+ smtpClient.Disconnect(true);
+ }
}
catch (Exception e) {
Logger.Error(e, "Could not send email");
diff --git a/src/Orchard.Web/Modules/Orchard.Email/packages.config b/src/Orchard.Web/Modules/Orchard.Email/packages.config
index f172c28e159..b2b2904568d 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/packages.config
+++ b/src/Orchard.Web/Modules/Orchard.Email/packages.config
@@ -1,13 +1,17 @@
-
+
-
+
+
+
+
+
\ No newline at end of file