Skip to content

Commit 1f35124

Browse files
lauranetokjac
lauraneto
and
kjac
authored
Dependencies: Update server dependencies (#20385)
* Bump Azure.Identity from 1.13.2 to 1.16.0 * Bump BenchmarkDotNet from 0.14.0 to 0.15.4 * Bump Bogus from 35.6.3 to 35.6.4 * Bump HtmlAgilityPack from 1.12.1 to 1.12.4 * Bump MailKit from 4.11.0 to 4.14.0 * Bump MessagePack from 3.1.3 to 3.1.4 * Bump Microsoft.AspNetCore.Mvc.Testing from 9.0.4 to 9.0.9 * Bump Microsoft.Data.SqlClient from 6.0.1 to 6.1.1 * Bump Microsoft.Extensions.Caching.Hybrid from 9.8.0 to 9.9.0 * Bump Microsoft.Extensions.Logging.Debug from 9.0.4 to 9.0.9 * Bump Microsoft.NET.Test.Sdk from 17.13.0 to 18.0.0 * Bump ncrontab from 3.3.3 to 3.4.0 * Bump Nerdbank.GitVersioning from 3.7.115 to 3.8.118 * Bump OpenIddict packages from 6.2.1 to 7.1.0 * Bump Serilog from 4.2.0 to 4.3.0 * Bump Serilog.Sinks.File from 6.0.0 to 7.0.0 * Bump Swashbuckle.AspNetCore from 8.1.1 to 9.0.6 * Bump System.Data.Odbc from 9.0.4 to 9.0.9 * Bump System.Data.OleDb from 9.0.4 to 9.0.9 * Bump Microsoft.IdentityModel.JsonWebTokens from 8.8.0 to 8.14.0 * Bump SixLabors.ImageSharp.Web from 3.1.5 to 3.2.0 - Implicit global usings were made opt-in (SixLabors/ImageSharp.Web#391) * Bump NJsonSchema from 11.0.2 to 11.5.1 * Bump Microsoft packages from 10.0.0-preview.7.25380.108 to 10.0.0-rc.1.25451.107 * Remove Azure.Identity package reference as implicitly referenced versions are no longer vulnerable * Remove System.Runtime.Caching package reference as it is not used * Remove System.Net.Http package reference as it is not used * Set 'allowPrerelease' to true Global.json was showing as invalid due to a pre-release version being referenced while 'allowPrerelease' was set to 'false'. This can be set to 'false' again later on. * Remove System.Security.Cryptography.Xml package reference as implicitly referenced versions are no longer vulnerable * Remove System.Text.RegularExpressions package reference as implicitly referenced versions are no longer vulnerable * Remove Microsoft.IdentityModel.JsonWebTokens package reference as implicitly referenced versions are no longer vulnerable * Remove System.Text.Encodings.Web package reference as it is not used * Remove Microsoft.Data.SqlClient package reference as implicitly referenced versions are no longer vulnerable * Remove Lucene.Net.Replicator package reference as implicitly referenced versions are no longer vulnerable * Remove Microsoft.Extensions.Caching.Memory package reference where not used * Add EFCore migration for OpenIddict v7 update * Apply suggestion from @kjac Cosmetic update: Removed blank line as suggested by Copilot --------- Co-authored-by: Kenn Jacobsen <[email protected]>
1 parent e3d2001 commit 1f35124

27 files changed

+689
-129
lines changed

‎Directory.Packages.props‎

Lines changed: 33 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,39 @@
55
</PropertyGroup>
66
<!-- Global packages (private, build-time packages for all projects) -->
77
<ItemGroup>
8-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
8+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.8.118" />
99
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
1010
<GlobalPackageReference Include="Umbraco.Code" Version="2.4.0" />
1111
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
1212
</ItemGroup>
1313
<!-- Microsoft packages -->
1414
<ItemGroup>
15-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.0-preview.7.25380.108" />
15+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.0-rc.1.25451.107" />
1616
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
1717
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
1818
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
1919
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0" />
2020
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0" />
21-
<PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.0-preview.7.25380.108" />
22-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0-preview.7.25380.108" />
23-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0-preview.7.25380.108" />
24-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-preview.7.25380.108" />
25-
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.0-preview.7.25380.108" />
26-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.7.25380.108" />
27-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25380.108" />
28-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25380.108" />
29-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.7.25380.108" />
30-
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-preview.7.25380.108" />
31-
<PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="10.0.0-preview.7.25380.108" />
32-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0-preview.7.25380.108" />
33-
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0-preview.7.25380.108" />
34-
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="10.0.0-preview.7.25380.108" />
35-
<PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="10.0.0-preview.7.25380.108" />
36-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0-preview.7.25380.108" />
37-
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0-preview.7.25380.108" />
38-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0-preview.7.25380.108" />
39-
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.0-preview.7.25380.108" />
40-
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.8.0" />
21+
<PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.0-rc.1.25451.107" />
22+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0-rc.1.25451.107" />
23+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0-rc.1.25451.107" />
24+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-rc.1.25451.107" />
25+
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.0-rc.1.25451.107" />
26+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25451.107" />
27+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25451.107" />
28+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25451.107" />
29+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25451.107" />
30+
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-rc.1.25451.107" />
31+
<PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="10.0.0-rc.1.25451.107" />
32+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0-rc.1.25451.107" />
33+
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0-rc.1.25451.107" />
34+
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="10.0.0-rc.1.25451.107" />
35+
<PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="10.0.0-rc.1.25451.107" />
36+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25451.107" />
37+
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0-rc.1.25451.107" />
38+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0-rc.1.25451.107" />
39+
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.0-rc.1.25451.107" />
40+
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.9.0" />
4141
<PackageVersion Include="System.Linq.Async" Version="6.0.3" />
4242
</ItemGroup>
4343
<!-- Umbraco packages -->
@@ -51,21 +51,21 @@
5151
<PackageVersion Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
5252
<PackageVersion Include="Examine" Version="3.7.1" />
5353
<PackageVersion Include="Examine.Core" Version="3.7.1" />
54-
<PackageVersion Include="HtmlAgilityPack" Version="1.12.1" />
54+
<PackageVersion Include="HtmlAgilityPack" Version="1.12.4" />
5555
<PackageVersion Include="JsonPatch.Net" Version="3.3.0" />
5656
<PackageVersion Include="K4os.Compression.LZ4" Version="1.3.8" />
57-
<PackageVersion Include="MailKit" Version="4.11.0" />
57+
<PackageVersion Include="MailKit" Version="4.14.0" />
5858
<PackageVersion Include="Markdown" Version="2.2.1" />
59-
<PackageVersion Include="MessagePack" Version="3.1.3" />
59+
<PackageVersion Include="MessagePack" Version="3.1.4" />
6060
<PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.5.4" />
6161
<PackageVersion Include="MiniProfiler.Shared" Version="4.5.4" />
62-
<PackageVersion Include="ncrontab" Version="3.3.3" />
62+
<PackageVersion Include="ncrontab" Version="3.4.0" />
6363
<PackageVersion Include="NPoco" Version="6.1.0" />
6464
<PackageVersion Include="NPoco.SqlServer" Version="6.1.0" />
65-
<PackageVersion Include="OpenIddict.Abstractions" Version="6.2.1" />
66-
<PackageVersion Include="OpenIddict.AspNetCore" Version="6.2.1" />
67-
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="6.2.1" />
68-
<PackageVersion Include="Serilog" Version="4.2.0" />
65+
<PackageVersion Include="OpenIddict.Abstractions" Version="7.1.0" />
66+
<PackageVersion Include="OpenIddict.AspNetCore" Version="7.1.0" />
67+
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="7.1.0" />
68+
<PackageVersion Include="Serilog" Version="4.3.0" />
6969
<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
7070
<PackageVersion Include="Serilog.Enrichers.Process" Version="3.0.0" />
7171
<PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0" />
@@ -75,33 +75,13 @@
7575
<PackageVersion Include="Serilog.Formatting.Compact.Reader" Version="4.0.0" />
7676
<PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
7777
<PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
78-
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
78+
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
7979
<PackageVersion Include="Serilog.Sinks.Map" Version="2.0.0" />
8080
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.11" />
81-
<PackageVersion Include="SixLabors.ImageSharp.Web" Version="3.1.5" />
82-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.1" />
81+
<PackageVersion Include="SixLabors.ImageSharp.Web" Version="3.2.0" />
82+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.6" />
8383
</ItemGroup>
8484
<!-- Transitive pinned versions (only required because our direct dependencies have vulnerable versions of transitive dependencies) -->
8585
<ItemGroup>
86-
<!-- Microsoft.EntityFrameworkCore.SqlServer and NPoco.SqlServer brings in a vulnerable version of Azure.Identity -->
87-
<!-- Take top-level depedendency on Azure.Identity, because Microsoft.EntityFrameworkCore.SqlServer depends on a vulnerable version -->
88-
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
89-
<!-- Microsoft.EntityFrameworkCore.SqlServer brings in a vulnerable version of System.Runtime.Caching -->
90-
<PackageVersion Include="System.Runtime.Caching" Version="10.0.0-preview.7.25380.108" />
91-
<!-- Dazinator.Extensions.FileProviders brings in a vulnerable version of System.Net.Http -->
92-
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
93-
<!-- Examine brings in a vulnerable version of System.Security.Cryptography.Xml -->
94-
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.0-preview.7.25380.108" />
95-
<!-- Dazinator.Extensions.FileProviders and MiniProfiler.AspNetCore.Mvc brings in a vulnerable version of System.Text.RegularExpressions -->
96-
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
97-
<!-- OpenIddict.AspNetCore, Npoco.SqlServer and Microsoft.EntityFrameworkCore.SqlServer brings in a vulnerable version of Microsoft.IdentityModel.JsonWebTokens -->
98-
<!-- Take top-level depedendency on Microsoft.IdentityModel.JsonWebTokens, because OpenIddict.AspNetCore, Npoco.SqlServer and Microsoft.EntityFrameworkCore.SqlServer depends on a vulnerable version -->
99-
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.8.0" />
100-
<!-- Azure.Identity, Microsoft.EntityFrameworkCore.SqlServer and Dazinator.Extensions.FileProviders brings in a legacy version of System.Text.Encodings.Web -->
101-
<PackageVersion Include="System.Text.Encodings.Web" Version="10.0.0-preview.7.25380.108" />
102-
<!-- NPoco.SqlServer brings in a vulnerable version of Microsoft.Data.SqlClient -->
103-
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.1" />
104-
<!-- Examine.Lucene brings in a vulnerable version of Lucene.Net.Replicator -->
105-
<PackageVersion Include="Lucene.Net.Replicator" Version="4.8.0-beta00017" />
10686
</ItemGroup>
10787
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"sdk": {
33
"version": "10.0.100-rc.1.25451.107",
44
"rollForward": "latestFeature",
5-
"allowPrerelease": false
5+
"allowPrerelease": true
66
}
77
}

‎src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
<PackageReference Include="OpenIddict.AspNetCore" />
1717
</ItemGroup>
1818

19-
<ItemGroup>
20-
<!-- Take top-level depedendency on OpenIddict.AspNetCore depends on a vulnerable version -->
21-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
22-
</ItemGroup>
23-
2419
<ItemGroup>
2520
<ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
2621
<ProjectReference Include="..\Umbraco.Web.Common\Umbraco.Web.Common.csproj" />

‎src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Microsoft.AspNetCore.Http.Headers;
44
using Microsoft.Extensions.Options;
55
using Microsoft.Net.Http.Headers;
6+
using SixLabors.ImageSharp;
67
using SixLabors.ImageSharp.Formats.Webp;
78
using SixLabors.ImageSharp.Web.Commands;
89
using SixLabors.ImageSharp.Web.Middleware;

‎src/Umbraco.Cms.Imaging.ImageSharp/ImageProcessors/CropWebProcessor.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
using System.Globalization;
22
using System.Numerics;
33
using Microsoft.Extensions.Logging;
4+
using SixLabors.ImageSharp;
45
using SixLabors.ImageSharp.Metadata.Profiles.Exif;
6+
using SixLabors.ImageSharp.Processing;
7+
using SixLabors.ImageSharp.Web;
58
using SixLabors.ImageSharp.Web.Commands;
69
using SixLabors.ImageSharp.Web.Processors;
710

‎src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpDimensionExtractor.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using SixLabors.ImageSharp;
12
using SixLabors.ImageSharp.Formats;
23
using SixLabors.ImageSharp.Metadata.Profiles.Exif;
34
using Umbraco.Cms.Core.Media;

‎src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpImageUrlGenerator.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using Microsoft.Extensions.DependencyInjection;
44
using Microsoft.Extensions.Options;
55
using Microsoft.Extensions.Primitives;
6+
using SixLabors.ImageSharp;
7+
using SixLabors.ImageSharp.Web;
68
using SixLabors.ImageSharp.Web.Middleware;
79
using SixLabors.ImageSharp.Web.Processors;
810
using Umbraco.Cms.Core.DependencyInjection;

‎src/Umbraco.Cms.Imaging.ImageSharp/UmbracoBuilderExtensions.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Microsoft.Extensions.DependencyInjection;
22
using Microsoft.Extensions.Options;
3+
using SixLabors.ImageSharp;
34
using SixLabors.ImageSharp.Web.Caching;
45
using SixLabors.ImageSharp.Web.DependencyInjection;
56
using SixLabors.ImageSharp.Web.Middleware;

0 commit comments

Comments
 (0)