yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated NuGet Dependencies (#14795)

Browse Source 
* Updated nuget packages and fixed breaking changes in ImageSharp

* Update to .net8 rc1
This commit is contained in:
Bjarke Berg
2023-09-19 11:23:20 +02:00
committed by GitHub
parent a133a4b57b
commit 989759fa20
18 changed files with 68 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj
View File

@@ -10,8 +10,8 @@
<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="OpenIddict.Abstractions" Version="4.5.0" />
<PackageReference Include="OpenIddict.AspNetCore" Version="4.5.0" />
<PackageReference Include="OpenIddict.Abstractions" Version="4.7.0" />
<PackageReference Include="OpenIddict.AspNetCore" Version="4.7.0" />
</ItemGroup>
<ItemGroup>

2
src/Umbraco.Cms.Imaging.ImageSharp/Umbraco.Cms.Imaging.ImageSharp.csproj
View File

@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.0.1" />
</ItemGroup>

2
src/Umbraco.Cms.Imaging.ImageSharp2/ImageProcessors/CropWebProcessor.cs
View File

@@ -64,7 +64,7 @@ public class CropWebProcessor : IImageWebProcessor
Vector2 xy2 = ExifOrientationUtilities.Transform(new Vector2(right, bottom), Vector2.Zero, Vector2.One, orientation);
// Scale points to a pixel based rectangle
Size size = image.Image.Size();
Size size = image.Image.Size;
return Rectangle.Round(RectangleF.FromLTRB(
MathF.Min(xy1.X, xy2.X) * size.Width,

26
src/Umbraco.Cms.Imaging.ImageSharp2/Media/ImageSharpDimensionExtractor.cs
View File

@@ -1,4 +1,5 @@
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.Metadata.Profiles.Exif;
using Umbraco.Cms.Core.Media;
using Size = System.Drawing.Size;
@@ -7,7 +8,7 @@ namespace Umbraco.Cms.Imaging.ImageSharp.Media;
public sealed class ImageSharpDimensionExtractor : IImageDimensionExtractor
{
private readonly Configuration _configuration;
private readonly DecoderOptions _decoderOptions;
/// <inheritdoc />
public IEnumerable<string> SupportedImageFileTypes { get; }
@@ -15,12 +16,12 @@ public sealed class ImageSharpDimensionExtractor : IImageDimensionExtractor
/// <summary>
/// Initializes a new instance of the <see cref="ImageSharpDimensionExtractor" /> class.
/// </summary>
/// <param name="configuration">The configuration.</param>
public ImageSharpDimensionExtractor(Configuration configuration)
/// <param name="decoderOptions">The configuration.</param>
public ImageSharpDimensionExtractor(DecoderOptions decoderOptions)
{
_configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
_decoderOptions = decoderOptions ?? throw new ArgumentNullException(nameof(decoderOptions));
SupportedImageFileTypes = configuration.ImageFormats.SelectMany(f => f.FileExtensions).ToArray();
SupportedImageFileTypes = decoderOptions.Configuration.ImageFormats.SelectMany(f => f.FileExtensions).ToArray();
}
/// <inheritdoc />
@@ -28,7 +29,12 @@ public sealed class ImageSharpDimensionExtractor : IImageDimensionExtractor
{
Size? size = null;
IImageInfo imageInfo = Image.Identify(_configuration, stream);
if (stream == null)
{
return size;
}
ImageInfo imageInfo = Image.Identify(_decoderOptions, stream);
if (imageInfo != null)
{
size = IsExifOrientationRotated(imageInfo)
@@ -39,7 +45,7 @@ public sealed class ImageSharpDimensionExtractor : IImageDimensionExtractor
return size;
}
private static bool IsExifOrientationRotated(IImageInfo imageInfo)
private static bool IsExifOrientationRotated(ImageInfo imageInfo)
=> GetExifOrientation(imageInfo) switch
{
ExifOrientationMode.LeftTop
@@ -49,10 +55,10 @@ public sealed class ImageSharpDimensionExtractor : IImageDimensionExtractor
_ => false,
};
private static ushort GetExifOrientation(IImageInfo imageInfo)
private static ushort GetExifOrientation(ImageInfo imageInfo)
{
IExifValue<ushort>? orientation = imageInfo.Metadata.ExifProfile?.GetValue(ExifTag.Orientation);
if (orientation is not null)
if(imageInfo.Metadata.ExifProfile != null && imageInfo.Metadata.ExifProfile.TryGetValue(ExifTag.Orientation, out IExifValue<ushort>? orientation))
{
if (orientation.DataType == ExifDataType.Short)
{

2
src/Umbraco.Cms.Imaging.ImageSharp2/Umbraco.Cms.Imaging.ImageSharp2.csproj
View File

@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="2.0.2" />
</ItemGroup>

2
src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj
View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.1.*" />
</ItemGroup>
<ItemGroup>

2
src/Umbraco.Cms.Persistence.EFCore.Sqlite/Umbraco.Cms.Persistence.EFCore.Sqlite.csproj
View File

@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.1.*" />
</ItemGroup>
<ItemGroup>

8
src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj
View File

@@ -5,10 +5,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.7.*" />
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.5.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.1.*" />
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.7.0" />
</ItemGroup>
<ItemGroup>

2
src/Umbraco.Cms.Persistence.Sqlite/Umbraco.Cms.Persistence.Sqlite.csproj
View File

@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0-rc.1.*" />
</ItemGroup>
<ItemGroup>

22
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -7,24 +7,24 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0-rc.1.*" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
<PackageReference Include="System.Runtime.Caching" Version="8.0.0-preview.7.*" />
<PackageReference Include="System.Runtime.Caching" Version="8.0.0-rc.1.*" />
</ItemGroup>
<ItemGroup>
<!-- Update implicit dependencies to fix security issues, even though we do not use them explicitly and they are taken from the shared framework instead of NuGet -->
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.0-preview.7.*" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.0-rc.1.*" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>

24
src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
View File

@@ -12,33 +12,33 @@
<ItemGroup>
<PackageReference Include="Examine.Core" Version="3.1.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.48" />
<PackageReference Include="MailKit" Version="4.1.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.53" />
<PackageReference Include="MailKit" Version="4.2.0" />
<PackageReference Include="Markdown" Version="2.2.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.0-rc.1.*" />
<PackageReference Include="MiniProfiler.Shared" Version="4.3.8" />
<PackageReference Include="ncrontab" Version="3.3.1" />
<PackageReference Include="ncrontab" Version="3.3.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NPoco" Version="5.7.1" />
<PackageReference Include="Serilog" Version="3.0.0" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Serilog.Enrichers.Process" Version="2.0.2" />
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
<PackageReference Include="Serilog.Expressions" Version="3.4.1" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
<PackageReference Include="Serilog.Formatting.Compact.Reader" Version="2.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Map" Version="1.0.2" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0-preview.7.*" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.0-preview.7.*" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0-rc.1.*" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.0-rc.1.*" />
</ItemGroup>
<ItemGroup>

4
src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
View File

@@ -7,9 +7,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MessagePack" Version="2.5.108" />
<PackageReference Include="MessagePack" Version="2.5.124" />
<PackageReference Include="Umbraco.CSharpTest.Net.Collections" Version="15.0.0" />
<PackageReference Include="K4os.Compression.LZ4" Version="1.3.5" />
<PackageReference Include="K4os.Compression.LZ4" Version="1.3.6" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

8
src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
View File

@@ -7,11 +7,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Asp.Versioning.Mvc" Version="7.0.0" />
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="7.0.0" />
<PackageReference Include="Asp.Versioning.Mvc" Version="7.0.1" />
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="7.0.1" />
<PackageReference Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0-rc.1.*" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
<PackageReference Include="Smidge.InMemory" Version="4.3.0" />
<PackageReference Include="Smidge.Nuglify" Version="4.3.0" />

2
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.7.*">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.1.*">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

4
tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker
View File

@@ -2,7 +2,7 @@
## Build
############################################
FROM mcr.microsoft.com/dotnet/nightly/sdk:8.0.100-preview.7-jammy AS build
FROM mcr.microsoft.com/dotnet/nightly/sdk:8.0.100-rc.1-jammy AS build
COPY nuget.config .
@@ -22,7 +22,7 @@ RUN dotnet publish --configuration Release --no-build --output /dist
## Run
############################################
FROM mcr.microsoft.com/dotnet/nightly/aspnet:8.0.0-preview.7-jammy AS run
FROM mcr.microsoft.com/dotnet/nightly/aspnet:8.0.0-rc.1-jammy AS run
WORKDIR /app
COPY --from=build dist .

4
tests/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
View File

@@ -4,8 +4,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0-preview.7.*" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0-rc.1.*" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />

4
tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
View File

@@ -11,8 +11,8 @@
<ItemGroup>
<PackageReference Include="Bogus" Version="34.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-preview.7.*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-rc.1.*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" PrivateAssets="all" />
</ItemGroup>

8
tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj
View File

@@ -5,11 +5,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
<PackageReference Include="AngleSharp" Version="1.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="AngleSharp" Version="1.0.4" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="System.Data.Odbc" Version="8.0.0-preview.7.*" />
<PackageReference Include="System.Data.OleDb" Version="8.0.0-preview.7.*" />
<PackageReference Include="System.Data.Odbc" Version="8.0.0-rc.1.*" />
<PackageReference Include="System.Data.OleDb" Version="8.0.0-rc.1.*" />
</ItemGroup>
<ItemGroup>