From e3418c6ee251502fb0b4afd934ea7d98ad9661fe Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 15:53:55 +0200 Subject: [PATCH 01/36] Bump Azure.Identity from 1.13.2 to 1.16.0 --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index a4f29851e3f0..9693832f0388 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -85,7 +85,7 @@ - + @@ -104,4 +104,4 @@ - + \ No newline at end of file From 75b542d6a9bc66ed92261824f14080767537364c Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 17:03:35 +0200 Subject: [PATCH 02/36] Bump BenchmarkDotNet from 0.14.0 to 0.15.4 --- tests/Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index b3b0192c0bba..a98f0e613b49 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -4,7 +4,7 @@ - + @@ -22,4 +22,4 @@ - + \ No newline at end of file From d00367548b0d26ed72186efb293f5d2485b377df Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 17:06:34 +0200 Subject: [PATCH 03/36] Bump Bogus from 35.6.3 to 35.6.4 --- tests/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index a98f0e613b49..c62c320dfce9 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -17,7 +17,7 @@ - + From 9a600ef8b8701c3697853346b2893756517b6193 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 17:08:11 +0200 Subject: [PATCH 04/36] Bump HtmlAgilityPack from 1.12.1 to 1.12.4 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9693832f0388..13dcb694403c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -51,7 +51,7 @@ - + From c8d1375613f07f7d9e127998785b162fe16ddf1a Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 17:09:10 +0200 Subject: [PATCH 05/36] Bump MailKit from 4.11.0 to 4.14.0 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 13dcb694403c..33d739413db6 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -54,7 +54,7 @@ - + From 490d1551f9299dadf322affbe66a7806bf985b6a Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 17:11:00 +0200 Subject: [PATCH 06/36] Bump MessagePack from 3.1.3 to 3.1.4 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 33d739413db6..be5dbeef60bc 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -56,7 +56,7 @@ - + From d46496c50de8afb98d1312c4ef37bec59b0886c2 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 17:12:23 +0200 Subject: [PATCH 07/36] Bump Microsoft.AspNetCore.Mvc.Testing from 9.0.4 to 9.0.9 --- tests/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index c62c320dfce9..5de429831522 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -5,7 +5,7 @@ - + From b32a7cd670347baf65c1c87aa2bf285d834e3f47 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 17:59:12 +0200 Subject: [PATCH 08/36] Bump Microsoft.Data.SqlClient from 6.0.1 to 6.1.1 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index be5dbeef60bc..1f3298275f90 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -100,7 +100,7 @@ - + From 8d145b9b41d8cf89c1d647dee1bb1f13b8bbf000 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 17:59:52 +0200 Subject: [PATCH 09/36] Bump Microsoft.Extensions.Caching.Hybrid from 9.8.0 to 9.9.0 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1f3298275f90..6821a50e58b7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -37,7 +37,7 @@ - + From d8492130e80d412084336825f420483006b4f6fd Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 18:00:49 +0200 Subject: [PATCH 10/36] Bump Microsoft.Extensions.Logging.Debug from 9.0.4 to 9.0.9 --- tests/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index 5de429831522..a9b44b078152 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -6,7 +6,7 @@ - + From 1aa2ac48a87ab0a51d95972b0b4ad71a6fb128c9 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 18:04:15 +0200 Subject: [PATCH 11/36] Bump Microsoft.NET.Test.Sdk from 17.13.0 to 18.0.0 --- tests/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index a9b44b078152..145884d1d3c6 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -7,7 +7,7 @@ - + From 7e22dd9ff7a259a56c5708970456c9523296aa5b Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 18:20:48 +0200 Subject: [PATCH 12/36] Bump ncrontab from 3.3.3 to 3.4.0 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 6821a50e58b7..4a66360ae228 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -59,7 +59,7 @@ - + From b45622d8aba3a82323a75e41ffe6abd200b0daf2 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 18:25:31 +0200 Subject: [PATCH 13/36] Bump Nerdbank.GitVersioning from 3.7.115 to 3.8.118 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 4a66360ae228..88cf22b723e1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ - + From c27b77bc26ddc2b70c6ecc31ffb757c3f50abfc8 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Fri, 3 Oct 2025 20:08:12 +0200 Subject: [PATCH 14/36] Bump OpenIddict packages from 6.2.1 to 7.1.0 --- Directory.Packages.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 88cf22b723e1..73da31e1ba45 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -62,9 +62,9 @@ - - - + + + From 882410dbc373bcb36e76056efacc83b27221edcd Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 09:29:09 +0200 Subject: [PATCH 15/36] Bump Serilog from 4.2.0 to 4.3.0 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 73da31e1ba45..870ca1528b49 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -65,7 +65,7 @@ - + From 2bb0bdaf3c8760483b5e123a91609c60c4076829 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 09:32:09 +0200 Subject: [PATCH 16/36] Bump Serilog.Sinks.File from 6.0.0 to 7.0.0 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 870ca1528b49..90e322bc1ac9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -75,7 +75,7 @@ - + From 53396db0a62c0a2538b072e2a0a42fdd63d7265a Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 10:25:51 +0200 Subject: [PATCH 17/36] Bump Swashbuckle.AspNetCore from 8.1.1 to 9.0.6 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 90e322bc1ac9..60f38975cf08 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -79,7 +79,7 @@ - + From 03cb8f9c17c8ddf7fdba7c0b4f7f54908a3448d4 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 10:26:15 +0200 Subject: [PATCH 18/36] Bump System.Data.Odbc from 9.0.4 to 9.0.9 --- tests/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index 145884d1d3c6..7fd99e947f27 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -9,7 +9,7 @@ - + From ea9b24b6fcd843a740171a640c3058214dbdcd84 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 10:26:45 +0200 Subject: [PATCH 19/36] Bump System.Data.OleDb from 9.0.4 to 9.0.9 --- tests/Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index 7fd99e947f27..9f98fb9d0b55 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -10,7 +10,7 @@ - + From bf0c64f87d3c42d2b5a961a0241c57a8c513c434 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 10:31:07 +0200 Subject: [PATCH 20/36] Bump Microsoft.IdentityModel.JsonWebTokens from 8.8.0 to 8.14.0 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 60f38975cf08..e7cad8d13888 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -96,7 +96,7 @@ - + From 895d07fee1e06b7f351ebc7c63dbc6a40f1b7a14 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 10:37:35 +0200 Subject: [PATCH 21/36] Bump SixLabors.ImageSharp.Web from 3.1.5 to 3.2.0 - Implicit global usings were made opt-in (https://github.com/SixLabors/ImageSharp.Web/pull/391) --- Directory.Packages.props | 2 +- .../ConfigureImageSharpMiddlewareOptions.cs | 1 + .../ImageProcessors/CropWebProcessor.cs | 3 +++ .../Media/ImageSharpDimensionExtractor.cs | 1 + .../Media/ImageSharpImageUrlGenerator.cs | 2 ++ src/Umbraco.Cms.Imaging.ImageSharp/UmbracoBuilderExtensions.cs | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e7cad8d13888..428943a582da 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -78,7 +78,7 @@ - + diff --git a/src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs b/src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs index 6ffa5c4a1e51..d6ed6abe06f0 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp/ConfigureImageSharpMiddlewareOptions.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Http.Headers; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; +using SixLabors.ImageSharp; using SixLabors.ImageSharp.Formats.Webp; using SixLabors.ImageSharp.Web.Commands; using SixLabors.ImageSharp.Web.Middleware; diff --git a/src/Umbraco.Cms.Imaging.ImageSharp/ImageProcessors/CropWebProcessor.cs b/src/Umbraco.Cms.Imaging.ImageSharp/ImageProcessors/CropWebProcessor.cs index 0107ae7d204d..2c065435229e 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp/ImageProcessors/CropWebProcessor.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp/ImageProcessors/CropWebProcessor.cs @@ -1,7 +1,10 @@ using System.Globalization; using System.Numerics; using Microsoft.Extensions.Logging; +using SixLabors.ImageSharp; using SixLabors.ImageSharp.Metadata.Profiles.Exif; +using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Web; using SixLabors.ImageSharp.Web.Commands; using SixLabors.ImageSharp.Web.Processors; diff --git a/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpDimensionExtractor.cs b/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpDimensionExtractor.cs index 0ec90bb358cc..c025cf9266d4 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpDimensionExtractor.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpDimensionExtractor.cs @@ -1,3 +1,4 @@ +using SixLabors.ImageSharp; using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.Metadata.Profiles.Exif; using Umbraco.Cms.Core.Media; diff --git a/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpImageUrlGenerator.cs b/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpImageUrlGenerator.cs index d119a911fe81..948034d97546 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpImageUrlGenerator.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp/Media/ImageSharpImageUrlGenerator.cs @@ -3,6 +3,8 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Microsoft.Extensions.Primitives; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Web; using SixLabors.ImageSharp.Web.Middleware; using SixLabors.ImageSharp.Web.Processors; using Umbraco.Cms.Core.DependencyInjection; diff --git a/src/Umbraco.Cms.Imaging.ImageSharp/UmbracoBuilderExtensions.cs b/src/Umbraco.Cms.Imaging.ImageSharp/UmbracoBuilderExtensions.cs index 7af10cdefa21..4bd50034abd9 100644 --- a/src/Umbraco.Cms.Imaging.ImageSharp/UmbracoBuilderExtensions.cs +++ b/src/Umbraco.Cms.Imaging.ImageSharp/UmbracoBuilderExtensions.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; +using SixLabors.ImageSharp; using SixLabors.ImageSharp.Web.Caching; using SixLabors.ImageSharp.Web.DependencyInjection; using SixLabors.ImageSharp.Web.Middleware; From b8683a66123b8ff7701570a990edd04da1695878 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 10:54:40 +0200 Subject: [PATCH 22/36] Bump NJsonSchema from 11.0.2 to 11.5.1 --- tools/Umbraco.JsonSchema/Umbraco.JsonSchema.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Umbraco.JsonSchema/Umbraco.JsonSchema.csproj b/tools/Umbraco.JsonSchema/Umbraco.JsonSchema.csproj index 91867b810db5..a22a6641acd6 100644 --- a/tools/Umbraco.JsonSchema/Umbraco.JsonSchema.csproj +++ b/tools/Umbraco.JsonSchema/Umbraco.JsonSchema.csproj @@ -18,7 +18,7 @@ - + From 0ea781b4c3ba397f012038ef08b840facc59eed5 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 11:45:20 +0200 Subject: [PATCH 23/36] Bump Microsoft packages from 10.0.0-preview.7.25380.108 to 10.0.0-rc.1.25451.107 --- Directory.Packages.props | 46 +++++++++++++++++----------------- tests/Directory.Packages.props | 8 +++--- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 428943a582da..b974e8372256 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -12,31 +12,31 @@ - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -87,18 +87,18 @@ - + - + - + diff --git a/tests/Directory.Packages.props b/tests/Directory.Packages.props index 9f98fb9d0b55..2afc1d49e8a9 100644 --- a/tests/Directory.Packages.props +++ b/tests/Directory.Packages.props @@ -5,12 +5,12 @@ - - + + - - + + From 2b5f9765ef9e014f2a7d4bf7865e0848a6367b81 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 12:41:51 +0200 Subject: [PATCH 24/36] Remove Azure.Identity package reference as implicitly referenced versions are no longer vulnerable --- Directory.Packages.props | 3 --- .../Umbraco.Cms.Persistence.EFCore.SqlServer.csproj | 2 -- .../Umbraco.Cms.Persistence.EFCore.csproj | 2 -- .../Umbraco.Cms.Persistence.SqlServer.csproj | 2 -- 4 files changed, 9 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index b974e8372256..c9b585caa336 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -83,9 +83,6 @@ - - - diff --git a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj index d232abc1f4b5..6ada7ea4c7ad 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj +++ b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj @@ -9,8 +9,6 @@ - - diff --git a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj index 08d2dc5448d7..ba9cb4f0bfb1 100644 --- a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj +++ b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj @@ -24,8 +24,6 @@ - - diff --git a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj index 65ec7d93d0a3..dae45a8c9149 100644 --- a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj +++ b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj @@ -27,8 +27,6 @@ - - From 956249520fe6566baf9eacf0fb0a53038326644e Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 13:03:31 +0200 Subject: [PATCH 25/36] Remove System.Runtime.Caching package reference as it is not used --- Directory.Packages.props | 2 -- .../Umbraco.Cms.Persistence.EFCore.SqlServer.csproj | 2 -- .../Umbraco.Cms.Persistence.EFCore.csproj | 2 -- .../Umbraco.Cms.Persistence.SqlServer.csproj | 2 -- 4 files changed, 8 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index c9b585caa336..1a29a90afe09 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -83,8 +83,6 @@ - - diff --git a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj index 6ada7ea4c7ad..7e85a716eb05 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj +++ b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj @@ -9,8 +9,6 @@ - - diff --git a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj index ba9cb4f0bfb1..27b03efe45ef 100644 --- a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj +++ b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj @@ -24,8 +24,6 @@ - - diff --git a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj index dae45a8c9149..ae3c26532c89 100644 --- a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj +++ b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj @@ -27,8 +27,6 @@ - - From f5917093055e8e93365cdfa060082ad1b1c1a19e Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 14:22:13 +0200 Subject: [PATCH 26/36] Remove System.Net.Http package reference as it is not used --- Directory.Packages.props | 4 +--- src/Umbraco.Web.Common/Umbraco.Web.Common.csproj | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1a29a90afe09..cac168f63356 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -83,8 +83,6 @@ - - @@ -99,4 +97,4 @@ - \ No newline at end of file + diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index c2712384277f..10b73549306e 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -35,8 +35,6 @@ - - From 0593ffa09c0378b3130079c79c9f74aa44e81ef4 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 14:27:22 +0200 Subject: [PATCH 27/36] 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. --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 5f3c37600096..55e0e2cf3a90 100644 --- a/global.json +++ b/global.json @@ -2,6 +2,6 @@ "sdk": { "version": "10.0.100-rc.1.25451.107", "rollForward": "latestFeature", - "allowPrerelease": false + "allowPrerelease": true } } From bb0bee3e04e1513a8a11daaa87df1ead6ae776d1 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 14:32:24 +0200 Subject: [PATCH 28/36] Remove System.Security.Cryptography.Xml package reference as implicitly referenced versions are no longer vulnerable --- Directory.Packages.props | 2 -- src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj | 2 -- 2 files changed, 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index cac168f63356..923b20b4b789 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -83,8 +83,6 @@ - - diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj index 890395e337a2..bf9afc703ab0 100644 --- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj +++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj @@ -19,8 +19,6 @@ - - From 79baa5cd6f957bc0d192e8acba68ebfeda6aaa63 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 14:42:13 +0200 Subject: [PATCH 29/36] Remove System.Text.RegularExpressions package reference as implicitly referenced versions are no longer vulnerable --- Directory.Packages.props | 2 -- src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj | 5 ----- src/Umbraco.Web.Common/Umbraco.Web.Common.csproj | 2 -- 3 files changed, 9 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 923b20b4b789..7bc847e21f9f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -83,8 +83,6 @@ - - diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 999ce21e07e2..1004517b4400 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -66,11 +66,6 @@ - - - - - diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index 10b73549306e..a5f4a9665bee 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -35,8 +35,6 @@ - - From 5f9093fec5cfbbb1d1a5ad7dcc45ad4b930b9c05 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 14:49:49 +0200 Subject: [PATCH 30/36] Remove Microsoft.IdentityModel.JsonWebTokens package reference as implicitly referenced versions are no longer vulnerable --- Directory.Packages.props | 3 --- .../Umbraco.Cms.Persistence.EFCore.SqlServer.csproj | 5 ----- src/Umbraco.Web.Common/Umbraco.Web.Common.csproj | 2 -- 3 files changed, 10 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 7bc847e21f9f..03d5847cc59a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -83,9 +83,6 @@ - - - diff --git a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj index 7e85a716eb05..5229f513a208 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj +++ b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Umbraco.Cms.Persistence.EFCore.SqlServer.csproj @@ -8,11 +8,6 @@ - - - - - diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index a5f4a9665bee..ae980933ed13 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -35,8 +35,6 @@ - - From 36318808041fcd2d59390d86bed8a8d8a31452d0 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 15:00:54 +0200 Subject: [PATCH 31/36] Remove System.Text.Encodings.Web package reference as it is not used --- Directory.Packages.props | 2 -- .../Umbraco.Cms.Persistence.EFCore.csproj | 5 ----- .../Umbraco.Cms.Persistence.SqlServer.csproj | 2 -- src/Umbraco.Web.Common/Umbraco.Web.Common.csproj | 5 ----- 4 files changed, 14 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 03d5847cc59a..0041a5f6bf82 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -83,8 +83,6 @@ - - diff --git a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj index 27b03efe45ef..ab6764b3c094 100644 --- a/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj +++ b/src/Umbraco.Cms.Persistence.EFCore/Umbraco.Cms.Persistence.EFCore.csproj @@ -23,11 +23,6 @@ - - - - - diff --git a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj index ae3c26532c89..183b89306f1d 100644 --- a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj +++ b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj @@ -27,8 +27,6 @@ - - diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index ae980933ed13..506a3d95399a 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -34,11 +34,6 @@ - - - - - From 84e18327bab2443bbeed557683180f840494f993 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 15:05:40 +0200 Subject: [PATCH 32/36] Remove Microsoft.Data.SqlClient package reference as implicitly referenced versions are no longer vulnerable --- Directory.Packages.props | 2 -- .../Umbraco.Cms.Persistence.SqlServer.csproj | 5 ----- 2 files changed, 7 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 0041a5f6bf82..cda0d62dea75 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -83,8 +83,6 @@ - - diff --git a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj index 183b89306f1d..661628020e60 100644 --- a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj +++ b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj @@ -26,11 +26,6 @@ - - - - - From 517051dd08390654f4b15c44a41a9a716c0de5ce Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 15:09:07 +0200 Subject: [PATCH 33/36] Remove Lucene.Net.Replicator package reference as implicitly referenced versions are no longer vulnerable --- Directory.Packages.props | 2 -- src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index cda0d62dea75..e2aa9d1c3fbe 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -83,7 +83,5 @@ - - diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj index bf9afc703ab0..89f8ebea0333 100644 --- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj +++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj @@ -13,14 +13,9 @@ --> $(WarningsNotAsErrors),CS0618 - - - - - - + From c76e44860616a066af33de85859b614e7c650902 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 15:22:24 +0200 Subject: [PATCH 34/36] Remove Microsoft.Extensions.Caching.Memory package reference where not used --- src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj b/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj index 5eb419c28e41..3a83eae75b22 100644 --- a/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj +++ b/src/Umbraco.Cms.Api.Common/Umbraco.Cms.Api.Common.csproj @@ -16,11 +16,6 @@ - - - - - From 4ab49f6d0b6e529250e47c5b1cdc2ddb2bf66b28 Mon Sep 17 00:00:00 2001 From: Laura Neto <12862535+lauraneto@users.noreply.github.com> Date: Mon, 6 Oct 2025 16:23:54 +0200 Subject: [PATCH 35/36] Add EFCore migration for OpenIddict v7 update --- ...006140751_UpdateOpenIddictToV7.Designer.cs | 277 ++++++++++++++++++ .../20251006140751_UpdateOpenIddictToV7.cs | 40 +++ .../UmbracoDbContextModelSnapshot.cs | 6 +- .../SqlServerMigrationProvider.cs | 2 +- ...006140958_UpdateOpenIddictToV7.Designer.cs | 269 +++++++++++++++++ .../20251006140958_UpdateOpenIddictToV7.cs | 22 ++ .../UmbracoDbContextModelSnapshot.cs | 4 +- .../SqliteMigrationProvider.cs | 3 +- .../Migrations/EFCoreMigration.cs | 1 + .../Upgrade/UmbracoPremigrationPlan.cs | 3 + .../Upgrade/V_17_0_0/UpdateToOpenIddictV7.cs | 19 ++ 11 files changed, 638 insertions(+), 8 deletions(-) create mode 100644 src/Umbraco.Cms.Persistence.EFCore.SqlServer/Migrations/20251006140751_UpdateOpenIddictToV7.Designer.cs create mode 100644 src/Umbraco.Cms.Persistence.EFCore.SqlServer/Migrations/20251006140751_UpdateOpenIddictToV7.cs create mode 100644 src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/20251006140958_UpdateOpenIddictToV7.Designer.cs create mode 100644 src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/20251006140958_UpdateOpenIddictToV7.cs create mode 100644 src/Umbraco.Infrastructure/Migrations/Upgrade/V_17_0_0/UpdateToOpenIddictV7.cs diff --git a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Migrations/20251006140751_UpdateOpenIddictToV7.Designer.cs b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Migrations/20251006140751_UpdateOpenIddictToV7.Designer.cs new file mode 100644 index 000000000000..1ac70b85c0b4 --- /dev/null +++ b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Migrations/20251006140751_UpdateOpenIddictToV7.Designer.cs @@ -0,0 +1,277 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Umbraco.Cms.Persistence.EFCore; + +#nullable disable + +namespace Umbraco.Cms.Persistence.EFCore.SqlServer.Migrations +{ + [DbContext(typeof(UmbracoDbContext))] + [Migration("20251006140751_UpdateOpenIddictToV7")] + partial class UpdateOpenIddictToV7 + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "10.0.0-rc.1.25451.107") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreApplication", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("nvarchar(450)"); + + b.Property("ApplicationType") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("ClientId") + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("ClientSecret") + .HasColumnType("nvarchar(max)"); + + b.Property("ClientType") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("ConcurrencyToken") + .IsConcurrencyToken() + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("ConsentType") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("DisplayName") + .HasColumnType("nvarchar(max)"); + + b.Property("DisplayNames") + .HasColumnType("nvarchar(max)"); + + b.Property("JsonWebKeySet") + .HasColumnType("nvarchar(max)"); + + b.Property("Permissions") + .HasColumnType("nvarchar(max)"); + + b.Property("PostLogoutRedirectUris") + .HasColumnType("nvarchar(max)"); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.Property("RedirectUris") + .HasColumnType("nvarchar(max)"); + + b.Property("Requirements") + .HasColumnType("nvarchar(max)"); + + b.Property("Settings") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.HasIndex("ClientId") + .IsUnique() + .HasFilter("[ClientId] IS NOT NULL"); + + b.ToTable("umbracoOpenIddictApplications", (string)null); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreAuthorization", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("nvarchar(450)"); + + b.Property("ApplicationId") + .HasColumnType("nvarchar(450)"); + + b.Property("ConcurrencyToken") + .IsConcurrencyToken() + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("CreationDate") + .HasColumnType("datetime2"); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.Property("Scopes") + .HasColumnType("nvarchar(max)"); + + b.Property("Status") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("Subject") + .HasMaxLength(400) + .HasColumnType("nvarchar(400)"); + + b.Property("Type") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.HasKey("Id"); + + b.HasIndex("ApplicationId", "Status", "Subject", "Type"); + + b.ToTable("umbracoOpenIddictAuthorizations", (string)null); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreScope", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("nvarchar(450)"); + + b.Property("ConcurrencyToken") + .IsConcurrencyToken() + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("Description") + .HasColumnType("nvarchar(max)"); + + b.Property("Descriptions") + .HasColumnType("nvarchar(max)"); + + b.Property("DisplayName") + .HasColumnType("nvarchar(max)"); + + b.Property("DisplayNames") + .HasColumnType("nvarchar(max)"); + + b.Property("Name") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.Property("Resources") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.HasIndex("Name") + .IsUnique() + .HasFilter("[Name] IS NOT NULL"); + + b.ToTable("umbracoOpenIddictScopes", (string)null); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("nvarchar(450)"); + + b.Property("ApplicationId") + .HasColumnType("nvarchar(450)"); + + b.Property("AuthorizationId") + .HasColumnType("nvarchar(450)"); + + b.Property("ConcurrencyToken") + .IsConcurrencyToken() + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("CreationDate") + .HasColumnType("datetime2"); + + b.Property("ExpirationDate") + .HasColumnType("datetime2"); + + b.Property("Payload") + .HasColumnType("nvarchar(max)"); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.Property("RedemptionDate") + .HasColumnType("datetime2"); + + b.Property("ReferenceId") + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("Status") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("Subject") + .HasMaxLength(400) + .HasColumnType("nvarchar(400)"); + + b.Property("Type") + .HasMaxLength(150) + .HasColumnType("nvarchar(150)"); + + b.HasKey("Id"); + + b.HasIndex("AuthorizationId"); + + b.HasIndex("ReferenceId") + .IsUnique() + .HasFilter("[ReferenceId] IS NOT NULL"); + + b.HasIndex("ApplicationId", "Status", "Subject", "Type"); + + b.ToTable("umbracoOpenIddictTokens", (string)null); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreAuthorization", b => + { + b.HasOne("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreApplication", "Application") + .WithMany("Authorizations") + .HasForeignKey("ApplicationId"); + + b.Navigation("Application"); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreToken", b => + { + b.HasOne("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreApplication", "Application") + .WithMany("Tokens") + .HasForeignKey("ApplicationId"); + + b.HasOne("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreAuthorization", "Authorization") + .WithMany("Tokens") + .HasForeignKey("AuthorizationId"); + + b.Navigation("Application"); + + b.Navigation("Authorization"); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreApplication", b => + { + b.Navigation("Authorizations"); + + b.Navigation("Tokens"); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreAuthorization", b => + { + b.Navigation("Tokens"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Migrations/20251006140751_UpdateOpenIddictToV7.cs b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Migrations/20251006140751_UpdateOpenIddictToV7.cs new file mode 100644 index 000000000000..0011d41ee565 --- /dev/null +++ b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Migrations/20251006140751_UpdateOpenIddictToV7.cs @@ -0,0 +1,40 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Umbraco.Cms.Persistence.EFCore.SqlServer.Migrations +{ + /// + public partial class UpdateOpenIddictToV7 : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AlterColumn( + name: "Type", + table: "umbracoOpenIddictTokens", + type: "nvarchar(150)", + maxLength: 150, + nullable: true, + oldClrType: typeof(string), + oldType: "nvarchar(50)", + oldMaxLength: 50, + oldNullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.AlterColumn( + name: "Type", + table: "umbracoOpenIddictTokens", + type: "nvarchar(50)", + maxLength: 50, + nullable: true, + oldClrType: typeof(string), + oldType: "nvarchar(150)", + oldMaxLength: 150, + oldNullable: true); + } + } +} diff --git a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Migrations/UmbracoDbContextModelSnapshot.cs b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Migrations/UmbracoDbContextModelSnapshot.cs index 77b5f4f406f3..2d655854c18e 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Migrations/UmbracoDbContextModelSnapshot.cs +++ b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/Migrations/UmbracoDbContextModelSnapshot.cs @@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.3") + .HasAnnotation("ProductVersion", "10.0.0-rc.1.25451.107") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); @@ -217,8 +217,8 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("nvarchar(400)"); b.Property("Type") - .HasMaxLength(50) - .HasColumnType("nvarchar(50)"); + .HasMaxLength(150) + .HasColumnType("nvarchar(150)"); b.HasKey("Id"); diff --git a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/SqlServerMigrationProvider.cs b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/SqlServerMigrationProvider.cs index 384f23f42295..d06456a5205f 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.SqlServer/SqlServerMigrationProvider.cs +++ b/src/Umbraco.Cms.Persistence.EFCore.SqlServer/SqlServerMigrationProvider.cs @@ -1,5 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Umbraco.Cms.Core; using Umbraco.Cms.Persistence.EFCore.Migrations; using Umbraco.Extensions; @@ -31,6 +30,7 @@ private static Type GetMigrationType(EFCoreMigration migration) => EFCoreMigration.InitialCreate => typeof(Migrations.InitialCreate), EFCoreMigration.AddOpenIddict => typeof(Migrations.AddOpenIddict), EFCoreMigration.UpdateOpenIddictToV5 => typeof(Migrations.UpdateOpenIddictToV5), + EFCoreMigration.UpdateOpenIddictToV7 => typeof(Migrations.UpdateOpenIddictToV7), _ => throw new ArgumentOutOfRangeException(nameof(migration), $@"Not expected migration value: {migration}") }; } diff --git a/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/20251006140958_UpdateOpenIddictToV7.Designer.cs b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/20251006140958_UpdateOpenIddictToV7.Designer.cs new file mode 100644 index 000000000000..b4e4fb85afd4 --- /dev/null +++ b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/20251006140958_UpdateOpenIddictToV7.Designer.cs @@ -0,0 +1,269 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Umbraco.Cms.Persistence.EFCore; + +#nullable disable + +namespace Umbraco.Cms.Persistence.EFCore.Sqlite.Migrations +{ + [DbContext(typeof(UmbracoDbContext))] + [Migration("20251006140958_UpdateOpenIddictToV7")] + partial class UpdateOpenIddictToV7 + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "10.0.0-rc.1.25451.107"); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreApplication", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("ApplicationType") + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.Property("ClientId") + .HasMaxLength(100) + .HasColumnType("TEXT"); + + b.Property("ClientSecret") + .HasColumnType("TEXT"); + + b.Property("ClientType") + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.Property("ConcurrencyToken") + .IsConcurrencyToken() + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.Property("ConsentType") + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.Property("DisplayName") + .HasColumnType("TEXT"); + + b.Property("DisplayNames") + .HasColumnType("TEXT"); + + b.Property("JsonWebKeySet") + .HasColumnType("TEXT"); + + b.Property("Permissions") + .HasColumnType("TEXT"); + + b.Property("PostLogoutRedirectUris") + .HasColumnType("TEXT"); + + b.Property("Properties") + .HasColumnType("TEXT"); + + b.Property("RedirectUris") + .HasColumnType("TEXT"); + + b.Property("Requirements") + .HasColumnType("TEXT"); + + b.Property("Settings") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ClientId") + .IsUnique(); + + b.ToTable("umbracoOpenIddictApplications", (string)null); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreAuthorization", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("ApplicationId") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyToken") + .IsConcurrencyToken() + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.Property("CreationDate") + .HasColumnType("TEXT"); + + b.Property("Properties") + .HasColumnType("TEXT"); + + b.Property("Scopes") + .HasColumnType("TEXT"); + + b.Property("Status") + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.Property("Subject") + .HasMaxLength(400) + .HasColumnType("TEXT"); + + b.Property("Type") + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ApplicationId", "Status", "Subject", "Type"); + + b.ToTable("umbracoOpenIddictAuthorizations", (string)null); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreScope", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("ConcurrencyToken") + .IsConcurrencyToken() + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("Descriptions") + .HasColumnType("TEXT"); + + b.Property("DisplayName") + .HasColumnType("TEXT"); + + b.Property("DisplayNames") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(200) + .HasColumnType("TEXT"); + + b.Property("Properties") + .HasColumnType("TEXT"); + + b.Property("Resources") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("umbracoOpenIddictScopes", (string)null); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT"); + + b.Property("ApplicationId") + .HasColumnType("TEXT"); + + b.Property("AuthorizationId") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyToken") + .IsConcurrencyToken() + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.Property("CreationDate") + .HasColumnType("TEXT"); + + b.Property("ExpirationDate") + .HasColumnType("TEXT"); + + b.Property("Payload") + .HasColumnType("TEXT"); + + b.Property("Properties") + .HasColumnType("TEXT"); + + b.Property("RedemptionDate") + .HasColumnType("TEXT"); + + b.Property("ReferenceId") + .HasMaxLength(100) + .HasColumnType("TEXT"); + + b.Property("Status") + .HasMaxLength(50) + .HasColumnType("TEXT"); + + b.Property("Subject") + .HasMaxLength(400) + .HasColumnType("TEXT"); + + b.Property("Type") + .HasMaxLength(150) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AuthorizationId"); + + b.HasIndex("ReferenceId") + .IsUnique(); + + b.HasIndex("ApplicationId", "Status", "Subject", "Type"); + + b.ToTable("umbracoOpenIddictTokens", (string)null); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreAuthorization", b => + { + b.HasOne("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreApplication", "Application") + .WithMany("Authorizations") + .HasForeignKey("ApplicationId"); + + b.Navigation("Application"); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreToken", b => + { + b.HasOne("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreApplication", "Application") + .WithMany("Tokens") + .HasForeignKey("ApplicationId"); + + b.HasOne("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreAuthorization", "Authorization") + .WithMany("Tokens") + .HasForeignKey("AuthorizationId"); + + b.Navigation("Application"); + + b.Navigation("Authorization"); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreApplication", b => + { + b.Navigation("Authorizations"); + + b.Navigation("Tokens"); + }); + + modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreAuthorization", b => + { + b.Navigation("Tokens"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/20251006140958_UpdateOpenIddictToV7.cs b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/20251006140958_UpdateOpenIddictToV7.cs new file mode 100644 index 000000000000..db8d93afb71c --- /dev/null +++ b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/20251006140958_UpdateOpenIddictToV7.cs @@ -0,0 +1,22 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Umbraco.Cms.Persistence.EFCore.Sqlite.Migrations +{ + /// + public partial class UpdateOpenIddictToV7 : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + // No changes required for Sqlite + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + + } + } +} diff --git a/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/UmbracoDbContextModelSnapshot.cs b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/UmbracoDbContextModelSnapshot.cs index 4ea82c3ff511..9d8fff819d67 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/UmbracoDbContextModelSnapshot.cs +++ b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/UmbracoDbContextModelSnapshot.cs @@ -15,7 +15,7 @@ partial class UmbracoDbContextModelSnapshot : ModelSnapshot protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "8.0.3"); + modelBuilder.HasAnnotation("ProductVersion", "10.0.0-rc.1.25451.107"); modelBuilder.Entity("OpenIddict.EntityFrameworkCore.Models.OpenIddictEntityFrameworkCoreApplication", b => { @@ -210,7 +210,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("TEXT"); b.Property("Type") - .HasMaxLength(50) + .HasMaxLength(150) .HasColumnType("TEXT"); b.HasKey("Id"); diff --git a/src/Umbraco.Cms.Persistence.EFCore.Sqlite/SqliteMigrationProvider.cs b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/SqliteMigrationProvider.cs index e25d2955c7b3..359c8aabb0ea 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.Sqlite/SqliteMigrationProvider.cs +++ b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/SqliteMigrationProvider.cs @@ -1,8 +1,6 @@ using Microsoft.EntityFrameworkCore; -using Umbraco.Cms.Core; using Umbraco.Cms.Persistence.EFCore.Migrations; using Umbraco.Extensions; -using Umbraco.Cms.Persistence.EFCore; namespace Umbraco.Cms.Persistence.EFCore.Sqlite; @@ -39,6 +37,7 @@ private static Type GetMigrationType(EFCoreMigration migration) => EFCoreMigration.InitialCreate => typeof(Migrations.InitialCreate), EFCoreMigration.AddOpenIddict => typeof(Migrations.AddOpenIddict), EFCoreMigration.UpdateOpenIddictToV5 => typeof(Migrations.UpdateOpenIddictToV5), + EFCoreMigration.UpdateOpenIddictToV7 => typeof(Migrations.UpdateOpenIddictToV7), _ => throw new ArgumentOutOfRangeException(nameof(migration), $@"Not expected migration value: {migration}") }; } diff --git a/src/Umbraco.Infrastructure/Migrations/EFCoreMigration.cs b/src/Umbraco.Infrastructure/Migrations/EFCoreMigration.cs index d29fa0225e95..ddaad0fd0156 100644 --- a/src/Umbraco.Infrastructure/Migrations/EFCoreMigration.cs +++ b/src/Umbraco.Infrastructure/Migrations/EFCoreMigration.cs @@ -5,4 +5,5 @@ public enum EFCoreMigration InitialCreate = 0, AddOpenIddict = 1, UpdateOpenIddictToV5 = 2, + UpdateOpenIddictToV7 = 3, } diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs index 380262c23a7a..9d2448de18ad 100644 --- a/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPremigrationPlan.cs @@ -73,5 +73,8 @@ protected virtual void DefinePlan() // called by a migration for 15. By using a pre-migration we ensure the lock record is in place when migrating // through 15 versions to the latest. To("{5ECCE7A7-2EFC-47A5-A081-FFD94D9F79AA}"); + + // To 17.0.0 + To("{D54EE168-C19D-48D8-9006-C7E719AD61FE}"); } } diff --git a/src/Umbraco.Infrastructure/Migrations/Upgrade/V_17_0_0/UpdateToOpenIddictV7.cs b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_17_0_0/UpdateToOpenIddictV7.cs new file mode 100644 index 000000000000..71378244f83e --- /dev/null +++ b/src/Umbraco.Infrastructure/Migrations/Upgrade/V_17_0_0/UpdateToOpenIddictV7.cs @@ -0,0 +1,19 @@ +using Umbraco.Cms.Persistence.EFCore.Migrations; + +namespace Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_17_0_0; + +public class UpdateToOpenIddictV7 : MigrationBase +{ + private readonly IEFCoreMigrationExecutor _efCoreMigrationExecutor; + + public UpdateToOpenIddictV7(IMigrationContext context, IEFCoreMigrationExecutor efCoreMigrationExecutor) + : base(context) + { + _efCoreMigrationExecutor = efCoreMigrationExecutor; + } + + protected override void Migrate() + { + _efCoreMigrationExecutor.ExecuteSingleMigrationAsync(EFCoreMigration.UpdateOpenIddictToV7); + } +} From 3eb4fed908d12fa5a33dcd0947863dbbae399d51 Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Tue, 7 Oct 2025 10:01:07 +0200 Subject: [PATCH 36/36] Apply suggestion from @kjac Cosmetic update: Removed blank line as suggested by Copilot --- .../Migrations/20251006140958_UpdateOpenIddictToV7.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/20251006140958_UpdateOpenIddictToV7.cs b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/20251006140958_UpdateOpenIddictToV7.cs index db8d93afb71c..c5800074985a 100644 --- a/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/20251006140958_UpdateOpenIddictToV7.cs +++ b/src/Umbraco.Cms.Persistence.EFCore.Sqlite/Migrations/20251006140958_UpdateOpenIddictToV7.cs @@ -16,7 +16,6 @@ protected override void Up(MigrationBuilder migrationBuilder) /// protected override void Down(MigrationBuilder migrationBuilder) { - } } }