diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d4cfba7b3..43d015141 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -15,7 +15,7 @@ variables:
buildName: '$(Build.SourceBranchName).$(readarrVersion)'
sentryOrg: 'servarr'
sentryUrl: 'https://sentry.servarr.com'
- dotnetVersion: '6.0.302'
+ dotnetVersion: '6.0.408'
nodeVersion: '16.X'
innoVersion: '6.2.0'
windowsImage: 'windows-2022'
diff --git a/package.json b/package.json
index e4efb0704..9d8660cb7 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
"@fortawesome/free-regular-svg-icons": "6.1.0",
"@fortawesome/free-solid-svg-icons": "6.1.0",
"@fortawesome/react-fontawesome": "0.1.18",
- "@microsoft/signalr": "6.0.7",
+ "@microsoft/signalr": "6.0.16",
"@sentry/browser": "6.18.2",
"@sentry/integrations": "6.18.2",
"ansi-colors": "4.1.1",
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 11b6bf608..c7210e6e5 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -4,8 +4,8 @@
-
-
+
+
@@ -15,24 +15,24 @@
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
+
@@ -41,13 +41,13 @@
-
-
-
+
+
+
-
+
@@ -59,7 +59,7 @@
-
+
diff --git a/src/NzbDrone.Core/MediaCover/ImageResizer.cs b/src/NzbDrone.Core/MediaCover/ImageResizer.cs
index ec2eefa78..c2f85c209 100644
--- a/src/NzbDrone.Core/MediaCover/ImageResizer.cs
+++ b/src/NzbDrone.Core/MediaCover/ImageResizer.cs
@@ -42,11 +42,9 @@ public void Resize(string source, string destination, int height)
try
{
- using (var image = Image.Load(source))
- {
- image.Mutate(x => x.Resize(0, height));
- image.Save(destination);
- }
+ using var image = Image.Load(source);
+ image.Mutate(x => x.Resize(0, height));
+ image.Save(destination);
}
catch
{
diff --git a/src/NzbDrone.Core/Notifications/Email/Email.cs b/src/NzbDrone.Core/Notifications/Email/Email.cs
index f69f7214e..198337ca1 100644
--- a/src/NzbDrone.Core/Notifications/Email/Email.cs
+++ b/src/NzbDrone.Core/Notifications/Email/Email.cs
@@ -9,7 +9,6 @@
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http.Dispatchers;
using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Security;
namespace NzbDrone.Core.Notifications.Email
{
@@ -167,47 +166,45 @@ private void SendEmail(EmailSettings settings, string subject, string body, bool
private void Send(MimeMessage email, EmailSettings settings)
{
- using (var client = new SmtpClient())
+ using var client = new SmtpClient();
+ client.Timeout = 10000;
+
+ var serverOption = SecureSocketOptions.Auto;
+
+ if (settings.RequireEncryption)
{
- client.Timeout = 10000;
-
- var serverOption = SecureSocketOptions.Auto;
-
- if (settings.RequireEncryption)
+ if (settings.Port == 465)
{
- if (settings.Port == 465)
- {
- serverOption = SecureSocketOptions.SslOnConnect;
- }
- else
- {
- serverOption = SecureSocketOptions.StartTls;
- }
+ serverOption = SecureSocketOptions.SslOnConnect;
}
-
- client.ServerCertificateValidationCallback = _certificateValidationService.ShouldByPassValidationError;
-
- _logger.Debug("Connecting to mail server");
-
- client.Connect(settings.Server, settings.Port, serverOption);
-
- if (!string.IsNullOrWhiteSpace(settings.Username))
+ else
{
- _logger.Debug("Authenticating to mail server");
-
- client.Authenticate(settings.Username, settings.Password);
+ serverOption = SecureSocketOptions.StartTls;
}
-
- _logger.Debug("Sending to mail server");
-
- client.Send(email);
-
- _logger.Debug("Sent to mail server, disconnecting");
-
- client.Disconnect(true);
-
- _logger.Debug("Disconnecting from mail server");
}
+
+ client.ServerCertificateValidationCallback = _certificateValidationService.ShouldByPassValidationError;
+
+ _logger.Debug("Connecting to mail server");
+
+ client.Connect(settings.Server, settings.Port, serverOption);
+
+ if (!string.IsNullOrWhiteSpace(settings.Username))
+ {
+ _logger.Debug("Authenticating to mail server");
+
+ client.Authenticate(settings.Username, settings.Password);
+ }
+
+ _logger.Debug("Sending to mail server");
+
+ client.Send(email);
+
+ _logger.Debug("Sent to mail server, disconnecting");
+
+ client.Disconnect(true);
+
+ _logger.Debug("Disconnecting from mail server");
}
private MailboxAddress ParseAddress(string type, string address)
diff --git a/yarn.lock b/yarn.lock
index bb3baf7c9..79d3e7a42 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1204,10 +1204,10 @@
"@jridgewell/resolve-uri" "3.1.0"
"@jridgewell/sourcemap-codec" "1.4.14"
-"@microsoft/signalr@6.0.7":
- version "6.0.7"
- resolved "https://registry.yarnpkg.com/@microsoft/signalr/-/signalr-6.0.7.tgz#8651d6807a0430575ce51960c254deab8d682b4c"
- integrity sha512-CoIz8K0IpaCGbI4rr2W8RHYA8Yq0KqY8DNsJzHw3UEWTJ3KqhWqeVCE8R24czzcsoUrE28xltEQ6qNTXZDHf3g==
+"@microsoft/signalr@6.0.16":
+ version "6.0.16"
+ resolved "https://registry.yarnpkg.com/@microsoft/signalr/-/signalr-6.0.16.tgz#d36498a9b16bf11c0e9213d77d24c0ad8ebffa47"
+ integrity sha512-wekzRtt2Ti38Ja0OQwLE0EKN0Zm7RI9VilrungwHe5Eej1IwnRYuhpauAqNtwwP3CY2j7uFT4XUk74E2vythTQ==
dependencies:
abort-controller "^3.0.0"
eventsource "^1.0.7"