open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update SixLabors.ImageSharp, MailKit, DryIoc libraries

Browse Source 
Closes #3478

Co-Authored-By: Stepan Goremykin <25577658+goremykin@users.noreply.github.com>
pull/3777/head
Qstick 2 years ago
parent 7444bebe69
commit ff73eab0de
6 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File

2
src/NzbDrone.Common/Lidarr.Common.csproj
Unescape View File

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

4
src/NzbDrone.Core/Lidarr.Core.csproj
Unescape View File

@ -13,7 +13,7 @@
<PackageReference Include="Servarr.FluentMigrator.Runner.SQLite" Version="3.3.2.9" /> <PackageReference Include="Servarr.FluentMigrator.Runner.SQLite" Version="3.3.2.9" />
<PackageReference Include="Servarr.FluentMigrator.Runner.Postgres" 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="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="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="NLog" Version="5.0.4" /> <PackageReference Include="NLog" Version="5.0.4" />
<PackageReference Include="NLog.Extensions.Logging" 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="Kveer.XmlRPC" Version="1.2.0" />
<PackageReference Include="Npgsql" Version="6.0.8" /> <PackageReference Include="Npgsql" Version="6.0.8" />
<PackageReference Include="SpotifyAPI.Web" Version="4.2.2" /> <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="Equ" Version="2.3.0" />
<PackageReference Include="MonoTorrent" Version="2.0.7" /> <PackageReference Include="MonoTorrent" Version="2.0.7" />
</ItemGroup> </ItemGroup>

8
src/NzbDrone.Core/MediaCover/ImageResizer.cs
Unescape View File

@ -42,11 +42,9 @@ namespace NzbDrone.Core.MediaCover
try try
{ {
using (var image = Image.Load(source)) using var image = Image.Load(source);
{ image.Mutate(x => x.Resize(0, height));
image.Mutate(x => x.Resize(0, height)); image.Save(destination);
image.Save(destination);
}
} }
catch catch
{ {

52
src/NzbDrone.Core/Notifications/Email/Email.cs
Unescape View File

@ -124,47 +124,45 @@ namespace NzbDrone.Core.Notifications.Email
private void Send(MimeMessage email, EmailSettings settings) private void Send(MimeMessage email, EmailSettings settings)
{ {
using (var client = new SmtpClient()) using var client = new SmtpClient();
{ client.Timeout = 10000;
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;
{
serverOption = SecureSocketOptions.SslOnConnect;
}
else
{
serverOption = SecureSocketOptions.StartTls;
}
} }
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)) if (!string.IsNullOrWhiteSpace(settings.Username))
{ {
_logger.Debug("Authenticating to mail server"); _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) public ValidationFailure Test(EmailSettings settings)

4
src/NzbDrone.Host/Lidarr.Host.csproj
Unescape View File

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

4
src/NzbDrone.Update/Lidarr.Update.csproj
Unescape View File

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

Write Preview
Loading…
Cancel
Save