github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 21:13:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update SixLabors.ImageSharp, MailKit, DryIoc libraries

Browse source 
Closes #3478

Co-Authored-By: Stepan Goremykin <25577658+goremykin@users.noreply.github.com>
This commit is contained in:
Qstick 2023-06-04 16:05:25 -05:00
commit ff73eab0de
6 changed files with 43 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/NzbDrone.Common/Lidarr.Common.csproj
View file

@ -5,7 +5,7 @@
<DefineConstants Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64' or '$(RuntimeIdentifier)' == 'linux-musl-arm64'">ISMUSL</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DryIoc.dll" Version="5.1.0" />
<PackageReference Include="DryIoc.dll" Version="5.3.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NLog" Version="5.0.4" />

4
src/NzbDrone.Core/Lidarr.Core.csproj
View file

@ -13,7 +13,7 @@
<PackageReference Include="Servarr.FluentMigrator.Runner.SQLite" Version="3.3.2.9" />
<PackageReference Include="Servarr.FluentMigrator.Runner.Postgres" Version="3.3.2.9" />
<PackageReference Include="FluentValidation" Version="9.5.4" />
<PackageReference Include="MailKit" Version="2.15.0" />
<PackageReference Include="MailKit" Version="3.6.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NLog" Version="5.0.4" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.0.4" />
@ -23,7 +23,7 @@
<PackageReference Include="Kveer.XmlRPC" Version="1.2.0" />
<PackageReference Include="Npgsql" Version="6.0.8" />
<PackageReference Include="SpotifyAPI.Web" Version="4.2.2" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
<PackageReference Include="Equ" Version="2.3.0" />
<PackageReference Include="MonoTorrent" Version="2.0.7" />
</ItemGroup>

8
src/NzbDrone.Core/MediaCover/ImageResizer.cs
View file

@ -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
{

68
src/NzbDrone.Core/Notifications/Email/Email.cs
View file

@ -124,47 +124,45 @@ namespace NzbDrone.Core.Notifications.Email
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");
}
public ValidationFailure Test(EmailSettings settings)

4
src/NzbDrone.Host/Lidarr.Host.csproj
View file

@ -7,8 +7,8 @@
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
<PackageReference Include="DryIoc.dll" Version="5.1.0" />
<PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="6.0.2" />
<PackageReference Include="DryIoc.dll" Version="5.3.4" />
<PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="6.1.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Lidarr.Api.V1\Lidarr.Api.V1.csproj" />

4
src/NzbDrone.Update/Lidarr.Update.csproj
View file

@ -4,8 +4,8 @@
<TargetFrameworks>net6.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DryIoc.dll" Version="5.1.0" />
<PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="6.0.2" />
<PackageReference Include="DryIoc.dll" Version="5.3.4" />
<PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="6.1.1" />
<PackageReference Include="NLog" Version="5.0.4" />
</ItemGroup>
<ItemGroup>