From 2abbee10320930de5ec1253e6085915c296ddec7 Mon Sep 17 00:00:00 2001
From: Stepan Goremykin <goremukin@gmail.com>
Date: Thu, 30 Mar 2023 21:56:54 -0700
Subject: [PATCH] Update SixLabors.ImageSharp, MailKit, DryIoc libraries

---
 src/NzbDrone.Common/Sonarr.Common.csproj      |  2 +-
 src/NzbDrone.Core/MediaCover/ImageResizer.cs  |  8 ++-
 .../Notifications/Email/Email.cs              | 53 +++++++++----------
 src/NzbDrone.Core/Sonarr.Core.csproj          |  4 +-
 src/NzbDrone.Host/Sonarr.Host.csproj          |  4 +-
 src/NzbDrone.Update/Sonarr.Update.csproj      |  4 +-
 src/Sonarr.sln.DotSettings                    |  2 +
 7 files changed, 37 insertions(+), 40 deletions(-)
 create mode 100644 src/Sonarr.sln.DotSettings

diff --git a/src/NzbDrone.Common/Sonarr.Common.csproj b/src/NzbDrone.Common/Sonarr.Common.csproj
index 6c026684c..c9527d5a3 100644
--- a/src/NzbDrone.Common/Sonarr.Common.csproj
+++ b/src/NzbDrone.Common/Sonarr.Common.csproj
@@ -4,7 +4,7 @@
     <DefineConstants Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64' or '$(RuntimeIdentifier)' == 'linux-musl-arm64'">ISMUSL</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="5.3.0" />
+    <PackageReference Include="DryIoc.dll" Version="5.3.4" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
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 @@ namespace NzbDrone.Core.MediaCover
 
             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 59244c1c1..3adf3b703 100644
--- a/src/NzbDrone.Core/Notifications/Email/Email.cs
+++ b/src/NzbDrone.Core/Notifications/Email/Email.cs
@@ -8,7 +8,6 @@ using MimeKit;
 using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http.Dispatchers;
-using NzbDrone.Core.Security;
 
 namespace NzbDrone.Core.Notifications.Email
 {
@@ -110,47 +109,45 @@ namespace NzbDrone.Core.Notifications.Email
 
         private void Send(MimeMessage email, EmailSettings settings)
         {
-            using (var client = new SmtpClient())
-            {
-                client.Timeout = 10000;
+            using var client = new SmtpClient();
+            client.Timeout = 10000;
 
-                var serverOption = SecureSocketOptions.Auto;
+            var serverOption = SecureSocketOptions.Auto;
 
-                if (settings.RequireEncryption)
+            if (settings.RequireEncryption)
+            {
+                if (settings.Port == 465)
                 {
-                    if (settings.Port == 465)
-                    {
-                        serverOption = SecureSocketOptions.SslOnConnect;
-                    }
-                    else
-                    {
-                        serverOption = SecureSocketOptions.StartTls;
-                    }
+                    serverOption = SecureSocketOptions.SslOnConnect;
                 }
+                else
+                {
+                    serverOption = SecureSocketOptions.StartTls;
+                }
+            }
 
-                client.ServerCertificateValidationCallback = _certificateValidationService.ShouldByPassValidationError;
+            client.ServerCertificateValidationCallback = _certificateValidationService.ShouldByPassValidationError;
 
-                _logger.Debug("Connecting to mail server");
+            _logger.Debug("Connecting to mail server");
 
-                client.Connect(settings.Server, settings.Port, serverOption);
+            client.Connect(settings.Server, settings.Port, serverOption);
 
-                if (!string.IsNullOrWhiteSpace(settings.Username))
-                {
-                    _logger.Debug("Authenticating to mail server");
+            if (!string.IsNullOrWhiteSpace(settings.Username))
+            {
+                _logger.Debug("Authenticating to mail server");
 
-                    client.Authenticate(settings.Username, settings.Password);
-                }
+                client.Authenticate(settings.Username, settings.Password);
+            }
 
-                _logger.Debug("Sending to mail server");
+            _logger.Debug("Sending to mail server");
 
-                client.Send(email);
+            client.Send(email);
 
-                _logger.Debug("Sent to mail server, disconnecting");
+            _logger.Debug("Sent to mail server, disconnecting");
 
-                client.Disconnect(true);
+            client.Disconnect(true);
 
-                _logger.Debug("Disconnecting from mail server");
-            }
+            _logger.Debug("Disconnecting from mail server");
         }
 
         public ValidationFailure Test(EmailSettings settings)
diff --git a/src/NzbDrone.Core/Sonarr.Core.csproj b/src/NzbDrone.Core/Sonarr.Core.csproj
index 9c71f8fdf..144fd96c5 100644
--- a/src/NzbDrone.Core/Sonarr.Core.csproj
+++ b/src/NzbDrone.Core/Sonarr.Core.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.0.123" />
-    <PackageReference Include="MailKit" Version="2.10.1" />
+    <PackageReference Include="MailKit" Version="3.6.0" />
     <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="6.0.15" />
     <PackageReference Include="Servarr.FFMpegCore" Version="4.7.0-26" />
     <PackageReference Include="Servarr.FFprobe" Version="5.1.2.106" />
@@ -15,7 +15,7 @@
     <PackageReference Include="FluentMigrator.Runner" Version="3.3.2" />
     <PackageReference Include="FluentMigrator.Runner.SQLite" Version="3.3.2" />
     <PackageReference Include="FluentValidation" Version="8.6.2" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="4.7.14" />
     <PackageReference Include="MonoTorrent" Version="2.0.7" />
diff --git a/src/NzbDrone.Host/Sonarr.Host.csproj b/src/NzbDrone.Host/Sonarr.Host.csproj
index b8d429164..a5c2563b0 100644
--- a/src/NzbDrone.Host/Sonarr.Host.csproj
+++ b/src/NzbDrone.Host/Sonarr.Host.csproj
@@ -9,8 +9,8 @@
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
-    <PackageReference Include="DryIoc.dll" Version="5.3.0" />
-    <PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="6.1.0" />
+    <PackageReference Include="DryIoc.dll" Version="5.3.4" />
+    <PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="6.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Common\Sonarr.Common.csproj" />
diff --git a/src/NzbDrone.Update/Sonarr.Update.csproj b/src/NzbDrone.Update/Sonarr.Update.csproj
index 8e86cce02..9ca0444c2 100644
--- a/src/NzbDrone.Update/Sonarr.Update.csproj
+++ b/src/NzbDrone.Update/Sonarr.Update.csproj
@@ -4,8 +4,8 @@
     <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="5.3.0" />
-    <PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="6.1.0" />
+    <PackageReference Include="DryIoc.dll" Version="5.3.4" />
+    <PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="6.1.1" />
     <PackageReference Include="NLog" Version="4.7.14" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Sonarr.sln.DotSettings b/src/Sonarr.sln.DotSettings
new file mode 100644
index 000000000..fac9652d9
--- /dev/null
+++ b/src/Sonarr.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sonarr/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file